Changeset 8574 for code/branches/gameimmersion/src/orxonox/controllers

Timestamp:

May 25, 2011, 6:23:51 PM (14 years ago)

Author:

dafrick

Message:

Reverting boost changes.

Location:

code/branches/gameimmersion/src/orxonox/controllers

Files:

• HumanController.cc (modified) (4 diffs)
• HumanController.h (modified) (1 diff)

code/branches/gameimmersion/src/orxonox/controllers/HumanController.cc

@@ -52 +52 @@
     SetConsoleCommand("HumanController", __CC_fire_name,           &HumanController::fire          ).addShortcut().keybindMode(KeybindMode::OnHold);
     SetConsoleCommand("HumanController", "reload",                 &HumanController::reload        ).addShortcut();
-    //SetConsoleCommand("HumanController", __CC_boost_name,          &HumanController::toggleBoost   ).addShortcut().keybindMode(KeybindMode::OnPress);
-    SetConsoleCommand("HumanController", "startBoost",             &HumanController::startBoost    ).addShortcut().keybindMode(KeybindMode::OnPress);
-    SetConsoleCommand("HumanController", "stopBoost",              &HumanController::stopBoost     ).addShortcut().keybindMode(KeybindMode::OnRelease);
+    SetConsoleCommand("HumanController", __CC_boost_name,          &HumanController::toggleBoost   ).addShortcut().keybindMode(KeybindMode::OnPress);
     SetConsoleCommand("HumanController", "greet",                  &HumanController::greet         ).addShortcut();
     SetConsoleCommand("HumanController", "switchCamera",           &HumanController::switchCamera  ).addShortcut();
@@ -173 +171 @@
     /*static*/ void HumanController::toggleBoost()
     {
-        COUT(0) << "Toggling boost!";
+        COUT(3) << "Toggling boost!" << endl; // TODO: Remove!
         if (HumanController::localController_s && HumanController::localController_s->controllableEntity_)
             HumanController::localController_s->toggleBoosting();
@@ -185 +183 @@
     void HumanController::toggleBoosting(void)
     {
-            /*
         this->boosting_ = !this->boosting_;
         
@@ -194 +191 @@
             ModifyConsoleCommand(__CC_boost_name).keybindMode(KeybindMode::OnPress);
 
-        this->controllableEntity_->boost(this->boosting_);*/
-    }
-    
-    void HumanController::startBoost()
-    {
-            COUT(0) << "Starting boost" << std::endl;
-            if (HumanController::localController_s && HumanController::localController_s->controllableEntity_)
-                    HumanController::localController_s->setBoost(true);
-    }
-    
-    void HumanController::stopBoost()
-    {
-            COUT(0) << "Stopping boost" << std::endl;
-            if (HumanController::localController_s && HumanController::localController_s->controllableEntity_)
-                    HumanController::localController_s->setBoost(false);
-    }
-    
-    void HumanController::setBoost(bool bBoost)
-    {
-            this->controllableEntity_->boost(bBoost);
-    }       
+        this->controllableEntity_->boost(this->boosting_);
+    }
 
     void HumanController::greet()

code/branches/gameimmersion/src/orxonox/controllers/HumanController.h

@@ -64 +64 @@
             static void reload();
 
-            static void startBoost();
-            static void stopBoost();
-            static void toggleBoost(); // Static method,toggles boosting.
-            void setBoost(bool);
+            static void toggleBoost(); // Static method, toggles boosting.
             /**
             @brief Check whether the HumanController is in boosting mode.