Changeset 3875 in orxonox.OLD

Timestamp:

Apr 18, 2005, 4:52:45 PM (19 years ago)

Author:

patrick

Message:

orxonox/trunk: weapon manager now works in player, cleaning up the rest

Location:

orxonox/trunk/src

Files:

• defs/debug.h (modified) (1 diff)
• world_entities/player.cc (modified) (2 diffs)
• world_entities/weapon.cc (modified) (2 diffs)
• world_entities/weapon.h (modified) (1 diff)

orxonox/trunk/src/defs/debug.h

@@ -70 +70 @@
 #define DEBUG_MODULE_WEAPON             3
 #define DEBUG_MODULE_MATH               0
-#define DEBUG_MODULE_FONT               4
-#define DEBUG_MODULE_ANIM               3
+#define DEBUG_MODULE_FONT               1
+#define DEBUG_MODULE_ANIM               1
 
 #define DEBUG_MODULE_NULL_PARENT        0

orxonox/trunk/src/world_entities/player.cc

@@ -58 +58 @@
   
   this->weaponMan->addWeapon(wpRight);
+  this->weaponMan->addWeapon(wpLeft);
 
   this->weapons->add(wpRight);
@@ -216 +217 @@
     {
       //if(this->activeWeapon != NULL)
-      this->activeWeapon->fire();
+      //this->activeWeapon->fire();
       //FIX THIS FIX FIIIIIIIIIIIX
-      this->activeWeaponL->fire();
+      //this->activeWeaponL->fire();
+      this->weaponMan->fire();
     }
   if( this->bWeaponChange && this->weapons->getSize() > 1)

orxonox/trunk/src/world_entities/weapon.cc

@@ -39 +39 @@
   this->nrOfSlots = nrOfSlots;
   
-  this->currConfID = W_CONFIG1;
+  for(int i = 0; i < W_MAX_CONFIGS; ++i)
+    for(int j = 0; j < W_MAX_SLOTS; ++j)
+      this->configs[i].slots[j] = NULL;
+
+  this->currConfID = W_CONFIG0;
   this->configs[this->currConfID].bUsed = true;
 }
@@ -91 +95 @@
 
 
+void WeaponManager::fire()
+{
+  Weapon* firingWeapon;
+  for(int i = 0; i < W_MAX_SLOTS; ++i)
+    {
+      firingWeapon = this->configs[this->currConfID].slots[i];
+      if( firingWeapon != NULL) firingWeapon->fire();
+    }
+}
+
+
 /**
    \brief standard constructor

orxonox/trunk/src/world_entities/weapon.h

@@ -79 +79 @@
   ~WeaponManager();
   
-  void addWeapon(Weapon* weapon, int slotID = W_FREE_SLOT, int configID = W_CONFIG1);
+  void addWeapon(Weapon* weapon, int slotID = W_FREE_SLOT, int configID = W_CONFIG0);
   void nextWeaponConf();
 
+  void fire();
 
  private:
   int nrOfConfigs;                      //<! number of configurations defined
   int nrOfSlots;                        //<! number of weapon slots a ship has
-  int currConfID;                    //<! the currently selected config
+  int currConfID;                       //<! the currently selected config
   weaponConfig configs[4];              //<! a list of four configurations