From: Côme Chilliet Date: Sat, 17 Dec 2016 16:33:53 +0000 (+0100) Subject: Renamed method because DrawText is reserved on some windows build X-Git-Url: https://git.jsancho.org/?a=commitdiff_plain;h=f0d67efd0a4269de425f6dad2e4e23dc869d3f91;hp=e66f03512f2e3471462c3927f47e464711eb7ae8;p=lugaru.git Renamed method because DrawText is reserved on some windows build --- diff --git a/Source/GameDraw.cpp b/Source/GameDraw.cpp index 7ab8565..5b3edfa 100644 --- a/Source/GameDraw.cpp +++ b/Source/GameDraw.cpp @@ -577,7 +577,7 @@ int Game::DrawGLScene(StereoSide side) } if (Tutorial::active) { - Tutorial::DrawText(); + Tutorial::DrawTextInfo(); } //Hot spots diff --git a/Source/Tutorial.cpp b/Source/Tutorial.cpp index cdb5599..7281a0c 100644 --- a/Source/Tutorial.cpp +++ b/Source/Tutorial.cpp @@ -518,7 +518,7 @@ void Tutorial::Do(float multiplier) } } -void Tutorial::DrawText() +void Tutorial::DrawTextInfo() { std::string string; std::string string2; diff --git a/Source/Tutorial.hpp b/Source/Tutorial.hpp index 827ea58..1c2c6da 100644 --- a/Source/Tutorial.hpp +++ b/Source/Tutorial.hpp @@ -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: