]> git.jsancho.org Git - lugaru.git/commitdiff
Merged identical switch cases in Tutorial
authorCôme Chilliet <come@chilliet.eu>
Fri, 16 Dec 2016 22:37:07 +0000 (23:37 +0100)
committerCôme Chilliet <come@chilliet.eu>
Fri, 16 Dec 2016 22:37:07 +0000 (23:37 +0100)
Source/Tutorial.cpp

index 006da97f10206da119fcf73153a8f09ae9098a03..cdb55996fae6d72f098a9bd3575145d518465f5b 100644 (file)
@@ -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;