Changeset 3001 for code/branches/pickups2/src/orxonox/objects/controllers

Timestamp:

May 20, 2009, 9:01:17 PM (16 years ago)

Author:

danielh

Message:

• Added helper method to HumanController to get it's ControllableEntity as a Pawn
• Removed tooltip, added default (empty) values for text and image from BaseItem
• Fixed tolua in BaseItem.h
• Added object to PickupCollection for the current UsableItem
• Moved most inventory logic from Lua to PickupInventory (still slow)

TODO

• Re-use of CEGUI item windows, destroying and creating them on each update is slow, very slow

File:

• code/branches/pickups2/src/orxonox/objects/controllers/HumanController.h (modified) (2 diffs)

code/branches/pickups2/src/orxonox/objects/controllers/HumanController.h

@@ -34 +34 @@
 #include "util/Math.h"
 #include "Controller.h"
+#include "objects/worldentities/pawns/Pawn.h"
 
 namespace orxonox
@@ -68 +69 @@
             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: