]> git.jsancho.org Git - lugaru.git/commitdiff
Renamed method because DrawText is reserved on some windows build
authorCôme Chilliet <come@chilliet.eu>
Sat, 17 Dec 2016 16:33:53 +0000 (17:33 +0100)
committerCôme Chilliet <come@chilliet.eu>
Sat, 17 Dec 2016 16:33:53 +0000 (17:33 +0100)
Source/GameDraw.cpp
Source/Tutorial.cpp
Source/Tutorial.hpp

index 7ab8565522fffe34d3455b536ae8d97300f9091a..5b3edfa18ffe6e9e3e00df3f9edd6e2bb125d916 100644 (file)
@@ -577,7 +577,7 @@ int Game::DrawGLScene(StereoSide side)
                 }
 
             if (Tutorial::active) {
-                Tutorial::DrawText();
+                Tutorial::DrawTextInfo();
             }
 
             //Hot spots
index cdb55996fae6d72f098a9bd3575145d518465f5b..7281a0c2d98be8d40c7598e827c2ad194d60f2a6 100644 (file)
@@ -518,7 +518,7 @@ void Tutorial::Do(float multiplier)
     }
 }
 
-void Tutorial::DrawText()
+void Tutorial::DrawTextInfo()
 {
     std::string string;
     std::string string2;
index 827ea58cfe83c4705a96f6d513425a76edcc9fad..1c2c6da8e0eff82f20c76e09987d56a22552c071 100644 (file)
@@ -30,7 +30,7 @@ public:
     static float maxtime;
 
     static void Do(float multiplier);
-    static void DrawText();
+    static void DrawTextInfo();
     static void DoStuff(float multiplier);
 
 private: