Changeset 7863 for code/trunk

Timestamp:

Feb 12, 2011, 1:09:42 PM (14 years ago)

Author:

landauf

Message:

disabled suicide for Spectator

Location:

code/trunk/src/orxonox

Files:

• controllers/HumanController.cc (modified) (2 diffs)
• worldentities/pawns/Spectator.cc (modified) (4 diffs)

code/trunk/src/orxonox/controllers/HumanController.cc

@@ -41 +41 @@
 {
     extern const std::string __CC_fire_name = "fire";
+    extern const std::string __CC_suicide_name = "suicide";
 
     SetConsoleCommand("HumanController", "moveFrontBack",          &HumanController::moveFrontBack ).addShortcut().setAsInputCommand();
@@ -54 +55 @@
     SetConsoleCommand("HumanController", "switchCamera",           &HumanController::switchCamera  ).addShortcut();
     SetConsoleCommand("HumanController", "mouseLook",              &HumanController::mouseLook     ).addShortcut();
-    SetConsoleCommand("HumanController", "suicide",                &HumanController::suicide       ).addShortcut();
+    SetConsoleCommand("HumanController", __CC_suicide_name,        &HumanController::suicide       ).addShortcut();
     SetConsoleCommand("HumanController", "toggleGodMode",          &HumanController::toggleGodMode ).addShortcut();
     SetConsoleCommand("HumanController", "addBots",                &HumanController::addBots       ).addShortcut().defaultValues(1);

code/trunk/src/orxonox/worldentities/pawns/Spectator.cc

@@ -43 +43 @@
 {
     extern const std::string __CC_fire_name;
+    extern const std::string __CC_suicide_name;
 
     CreateFactory(Spectator);
@@ -154 +155 @@
 
     /**
-        @brief Changes the keybind mode of the fire command to OnPress.
+        @brief Changes the behavior of some console commands.
     */
     void Spectator::startLocalHumanControl()
@@ -162 +163 @@
         // change keybind mode of fire command to OnPress to avoid firing after respawn
         ModifyConsoleCommand(__CC_fire_name).keybindMode(KeybindMode::OnPress);
+
+        // disable suicide
+        ModifyConsoleCommand(__CC_suicide_name).pushFunction(&prototype::void__void);
     }
 
     /**
-        @brief Changes the keybind mode of the fire command back to OnHold.
+        @brief Changes the behavior of some console commands back to the original state.
     */
     void Spectator::stopLocalHumanControl()
@@ -174 +178 @@
         // as soon as the player releases and presses the button again, the helper function will be called which changes the keybind mode back to OnHold
         ModifyConsoleCommand(__CC_fire_name).pushFunction(&Spectator::resetFireCommand).keybindMode(KeybindMode::OnPress);
+
+        // enable suicide
+        ModifyConsoleCommand(__CC_suicide_name).popFunction();
     }