Changeset 3053 for code/trunk/src/orxonox/objects/worldentities/ControllableEntity.h

Timestamp:

May 25, 2009, 4:19:14 AM (15 years ago)

Author:

landauf

Message:

merged weapons branch back to trunk

Location:

code/trunk

Files:

• . (modified) (1 prop)
• src/orxonox/objects/worldentities/ControllableEntity.h (modified) (2 diffs)

code/trunk/src/orxonox/objects/worldentities/ControllableEntity.h

@@ -31 +31 @@
 
 #include "OrxonoxPrereqs.h"
-
 #include "MobileEntity.h"
-#include "objects/weaponSystem/WeaponSystem.h"
 
 namespace orxonox
@@ -82 +80 @@
                 { this->rotateRoll(Vector2(value, 0)); }
 
-            virtual void fire(WeaponMode::Enum fireMode) {}
-            virtual void altFire(WeaponMode::Enum fireMode) {}
+            virtual void fire(unsigned int firemode) {}
+            virtual void reload() {}
 
             virtual void boost() {}