Renamed method because DrawText is reserved on some windows build

[lugaru.git] / Source / Tutorial.cpp

diff --git a/Source/Tutorial.cpp b/Source/Tutorial.cpp
index 006da97f10206da119fcf73153a8f09ae9098a03..7281a0c2d98be8d40c7598e827c2ad194d60f2a6 100644 (file)
--- a/Source/Tutorial.cpp
+++ b/Source/Tutorial.cpp
@@ -152,6 +152,7 @@ void Tutorial::Do(float multiplier)
                 maxtime = 13;
                 break;
             case 32:
+            case 42:
                 maxtime = 8;
                 break;
             case 33:
@@ -210,9 +211,6 @@ void Tutorial::Do(float multiplier)
             case 43:
                 maxtime = 300;
                 break;
-            case 42:
-                maxtime = 8;
-                break;
             case 44:
                 weapons[0].owner = 1;
                 Person::players[0]->weaponactive = -1;
@@ -461,6 +459,9 @@ void Tutorial::Do(float multiplier)
                 break;
             case 33:
             case 34:
+            case 44:
+            case 45:
+            case 46:
                 if (Animation::animations[Person::players[0]->animTarget].attack == reversal) {
                     success = 1;
                 }
@@ -488,13 +489,6 @@ void Tutorial::Do(float multiplier)
                     success = 1;
                 }
                 break;
-            case 44:
-            case 45:
-            case 46:
-                if (Animation::animations[Person::players[0]->animTarget].attack == reversal) {
-                    success = 1;
-                }
-                break;
             case 49:
                 if (Person::players[1]->weaponstuck != -1) {
                     success = 1;
@@ -524,7 +518,7 @@ void Tutorial::Do(float multiplier)
     }
 }
 
-void Tutorial::DrawText()
+void Tutorial::DrawTextInfo()
 {
     std::string string;
     std::string string2;