Changeset 3073 for code/trunk/src/orxonox/objects/controllers

Timestamp:

May 25, 2009, 8:30:15 PM (16 years ago)

Author:

landauf

Message:

merged pickups2 branch back to trunk. not yet tested.

Location:

code/trunk

Files:

• . (modified) (2 props)
• src/orxonox/objects/controllers/HumanController.cc (modified) (4 diffs)
• src/orxonox/objects/controllers/HumanController.h (modified) (3 diffs)

code/trunk

@@ -1 +1 @@
 build
 codeblocks
+dependencies

@@ -1 +1 @@
 build
 codeblocks
+dependencies

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

@@ -49 +49 @@
     SetConsoleCommand(HumanController, boost,         true).keybindMode(KeybindMode::OnHold);
     SetConsoleCommand(HumanController, greet,         true);
-    SetConsoleCommand(HumanController, use,           true);
     SetConsoleCommand(HumanController, switchCamera,  true);
     SetConsoleCommand(HumanController, mouseLook,     true);
@@ -56 +55 @@
     SetConsoleCommand(HumanController, killBots,      true).defaultValues(0);
     SetConsoleCommand(HumanController, dropItems,     true);
+    SetConsoleCommand(HumanController, useItem,       true);
 
     CreateUnloadableFactory(HumanController);
@@ -133 +133 @@
     }
 
-    void HumanController::use()
-    {
-        if (HumanController::localController_s && HumanController::localController_s->controllableEntity_)
-            HumanController::localController_s->controllableEntity_->use();
-    }
-
     void HumanController::switchCamera()
     {
@@ -163 +157 @@
     }
 
+    void HumanController::useItem()
+    {
+        if (HumanController::localController_s && HumanController::localController_s->controllableEntity_)
+            HumanController::localController_s->controllableEntity_->useItem();
+    }
+
     void HumanController::addBots(unsigned int amount)
     {

code/trunk/src/orxonox/objects/controllers/HumanController.h

@@ -34 +34 @@
 #include "util/Math.h"
 #include "Controller.h"
+#include "objects/worldentities/pawns/Pawn.h"
 
 namespace orxonox
@@ -56 +57 @@
             static void boost();
             static void greet();
-            static void use();
             static void switchCamera();
             static void mouseLook();
             static void dropItems();
+            static void useItem();
 
             static void suicide();
@@ -65 +66 @@
             static void addBots(unsigned int amount);
             static void killBots(unsigned int amount = 0);
+
+            static inline HumanController* getLocalControllerSingleton()
+                { return HumanController::localController_s; }
+            static inline Pawn* getLocalControllerEntityAsPawn()
+            {
+                if (HumanController::localController_s) {
+                    return dynamic_cast<Pawn*>(HumanController::localController_s->getControllableEntity());
+                } else {
+                    return NULL;
+                }
+            }
 
         private:

@@ -1 +1 @@
 build
 codeblocks
+dependencies