Changeset 2145 for code/branches/weapon2/src/orxonox/objects/worldentities

Timestamp:

Nov 5, 2008, 7:57:16 PM (16 years ago)

Author:

polakma

Message:

added firemodes and a lot of other things

Location:

code/branches/weapon2/src/orxonox/objects/worldentities

Files:

• ControllableEntity.h (modified) (2 diffs)
• pawns/Pawn.cc (modified) (3 diffs)
• pawns/Pawn.h (modified) (2 diffs)

code/branches/weapon2/src/orxonox/objects/worldentities/ControllableEntity.h

@@ -34 +34 @@
 #include "WorldEntity.h"
 #include "objects/Tickable.h"
+#include "objects/weaponSystem/WeaponSystem.h"
 
 namespace orxonox
@@ -65 +66 @@
             virtual void rotateRoll(const Vector2& value) {}
 
-            virtual void fire() {}
-            virtual void altFire() {}
+            virtual void fire(WeaponMode::Enum fireMode) {}
+            virtual void altFire(WeaponMode::Enum fireMode) {}
 
             virtual void greet() {}

code/branches/weapon2/src/orxonox/objects/worldentities/pawns/Pawn.cc

@@ -35 +35 @@
 #include "objects/infos/PlayerInfo.h"
 #include "objects/gametypes/Gametype.h"
-#include "objects/weaponSystem/WeaponSystem.h"
+
 
 namespace orxonox
@@ -54 +54 @@
         this->weaponSystem_ = 0;
 
+        //WeaponSystem
+        weaponSystem_ = new WeaponSystem(this);
         /*
-        //WeaponSystem
-        weaponSystem_ = new WeaponSystem();
         WeaponSet * weaponSet1 = new WeaponSet(1);
         this->weaponSystem_->attachWeaponSet(weaponSet1);
@@ -137 +137 @@
     }
 
-    void Pawn::fire()
+    void Pawn::fire(WeaponMode::Enum fireMode)
     {
         if (this->weaponSystem_)
-            this->weaponSystem_->fire();
+            this->weaponSystem_->fire(fireMode);
     }
 

code/branches/weapon2/src/orxonox/objects/worldentities/pawns/Pawn.h

@@ -33 +33 @@
 
 #include "objects/worldentities/ControllableEntity.h"
+#include "objects/weaponSystem/WeaponSystem.h"
 
 namespace orxonox
@@ -74 +75 @@
             virtual void kill();
 
-            virtual void fire();
+            virtual void fire(WeaponMode::Enum fireMode);
 
             virtual void postSpawn();