Added methods for hasWeapon and isPlayerControlled

[lugaru.git] / Source / Tutorial.cpp

diff --git a/Source/Tutorial.cpp b/Source/Tutorial.cpp
index 22ec959d214d5b028e9989607af31c1709ef1ba7..c60ad9b1b79c9c2746df62d5eff9120199b299e3 100644 (file)
--- a/Source/Tutorial.cpp
+++ b/Source/Tutorial.cpp
@@ -302,7 +302,7 @@ void Tutorial::Do(float multiplier)
                 Person::players[1]->num_weapons = 1;
                 Person::players[1]->weaponids[0] = 0;
 
-                if (Person::players[0]->weaponactive != -1) {
+                if (Person::players[0]->hasWeapon()) {
                     weapons[Person::players[0]->weaponids[Person::players[0]->weaponactive]].setType(staff);
                 } else {
                     weapons[0].setType(staff);
@@ -508,7 +508,7 @@ void Tutorial::Do(float multiplier)
                 }
                 break;
             case 41:
-                if (Person::players[0]->weaponactive == -1 && Person::players[0]->num_weapons > 0) {
+                if (!Person::players[0]->hasWeapon() && Person::players[0]->num_weapons > 0) {
                     success = 1;
                 }
                 break;