Changeset 9730 for code/trunk

Timestamp:

Oct 31, 2013, 10:25:40 PM (11 years ago)

Author:

jo

Message:

Making the setLives function more flexible. The game can be immediately ended by setting the lives to zero.

File:

• code/trunk/src/orxonox/gametypes/Mission.cc (modified) (2 diffs)

code/trunk/src/orxonox/gametypes/Mission.cc

@@ -61 +61 @@
             this->end();
         }
+        else if (this->lives_ == 0)
+        {
+            this->missionAccomplished_ = false;
+            this->end();
+        }
     }
 
@@ -68 +73 @@
         {
             this->lives_--;
-            if (this->lives_ == 0)
-            {
-                this->missionAccomplished_ = false;
-                this->end();
-            }
         }
     }