Changeset 3878 in orxonox.OLD for orxonox/trunk

Timestamp:

Apr 18, 2005, 6:12:16 PM (20 years ago)

Author:

patrick

Message:

orxonox/trunk: the weaponconfiguration can now be changed by pressing the 'm' key.

Location:

orxonox/trunk/src/world_entities

Files:

• player.cc (modified) (9 diffs)
• weapon.cc (modified) (6 diffs)
• weapon.h (modified) (2 diffs)

orxonox/trunk/src/world_entities/player.cc

@@ -38 +38 @@
 Player::Player() : WorldEntity()
 {
-  this->weapons = new tList<Weapon>();
-  this->activeWeapon = NULL;
   /*
     this is the debug player - actualy we would have to make a new
@@ -51 +49 @@
   bUp = bDown = bLeft = bRight = bAscend = bDescend = false;
   bFire = false;
+  this->bWeaponChange = false;
   acceleration = 10.0;
   //weapons:
@@ -57 +56 @@
   Weapon* wpLeft = new TestGun(this, new Vector(-2.6, 0.1, -3.0), new Quaternion(), 1);
   
-  this->weaponMan->addWeapon(wpRight);
-  this->weaponMan->addWeapon(wpLeft);
+  this->weaponMan->addWeapon(wpRight, W_CONFIG0);
+  this->weaponMan->addWeapon(wpLeft, W_CONFIG1);
 
   //this->weapons->add(wpRight);
@@ -74 +73 @@
      this only frees the memory allocated to save the list.
   */
-  delete this->weapons;
   delete this->weaponMan;
 }
@@ -85 +83 @@
 void Player::addWeapon(Weapon* weapon)
 {
-  this->weapons->add(weapon);
+  this->weaponMan->addWeapon(weapon);
 }
 
@@ -95 +93 @@
 void Player::removeWeapon(Weapon* weapon)
 {
-  this->weapons->remove(weapon);
+  this->weaponMan->removeWeapon(weapon);
 }
 
@@ -157 +155 @@
   glPopMatrix();
 
-  //this->activeWeapon->draw();
-  //this->activeWeaponL->draw();
   this->weaponMan->draw();
 }
@@ -221 +217 @@
   if( this->bWeaponChange)
     {
-      //this->activeWeapon->deactivate();
-      //this->weapons->enumerate();  FIX: strang weapon change...
-      //this->activeWeapon = this->weapons->nextElement(this->activeWeapon);
-      //this->activeWeapon->activate();
       this->weaponMan->nextWeaponConf();
+      this->bWeaponChange = false;
     }
 }
@@ -244 +237 @@
   if( !strcmp( cmd->cmd, "right")) this->bRight = !cmd->bUp;
   if( !strcmp( cmd->cmd, "fire")) this->bFire = !cmd->bUp;
-  if( !strcmp( cmd->cmd, "mode")) this->bWeaponChange = !cmd->bUp;
-}
+  if( !strcmp( cmd->cmd, "mode")) if(cmd->bUp) this->bWeaponChange = !this->bWeaponChange;
+}

orxonox/trunk/src/world_entities/weapon.cc

@@ -56 +56 @@
 
 
-void WeaponManager::addWeapon(Weapon* weapon, int slotID, int configID) 
+/**
+   \brief adds a weapon to the selected weaponconfiguration into the selected slot
+   \param the weapon to add
+   \param an identifier for the slot: number between 0..7 if not specified: slotID=next free slot
+   \param an identifier for the weapon configuration, number between 0..3
+
+   if you add explicitly a weapon at config:n, slot:m, the weapon placed at this location will be
+   replaced by the weapon specified. if you use the W_FREE_SLOT, the manager will look for a free
+   slot in this weaponconfiguration. if there is non, the weapon won't be added and there will be 
+   a error message.
+*/
+void WeaponManager::addWeapon(Weapon* weapon, int configID, int slotID) 
 {
   if( slotID == W_FREE_SLOT)
     {
-      int freeSlot = this->getNextFreeSlot();
+      int freeSlot = this->getNextFreeSlot( configID);
       if( freeSlot < 0 || freeSlot >= this->nrOfSlots)
         {
@@ -67 +78 @@
         }
       PRINTF(3)("Added new Weapon to Config:%i/Slot:%i\n", configID, freeSlot);
+      this->configs[configID].bUsed = true;
       this->configs[configID].slots[freeSlot] = weapon;
       return;
     }
+  this->configs[configID].bUsed = true;
   this->configs[configID].slots[slotID] = weapon;
   PRINTF(3)("Added a new Weapon to the WeaponManager: config %i/ slot %i\n", configID, slotID);
@@ -75 +88 @@
 
 
+void WeaponManager::removeWeapon(Weapon* weapon, int configID)
+{
+  /* empty */
+}
+
+
+/**
+   \brief changes to the next weapon configuration
+
+   if there are multiple weapon configurations defined by the manager, use this to switch between them
+*/
 void WeaponManager::nextWeaponConf() 
 {
-  PRINTF(3)("Changing weapon configuration: from %i ", this->currConfID);
+  PRINTF(3)("Changing weapon configuration: from %i\n", this->currConfID);
   int i;
-  for(i = this->currConfID; i < W_MAX_CONFIGS && !this->configs[i].bUsed; ++i);
+  for(i = this->currConfID + 1; i < W_MAX_CONFIGS && !this->configs[i].bUsed; ++i);
   if( i == W_MAX_CONFIGS) this->currConfID = W_CONFIG0;
   else this->currConfID = i;  
-  PRINTF(3)("to %i\n", this->currConfID);
-}
-
-
-int WeaponManager::getNextFreeSlot()
-{
-  for( int i = 0; i < W_MAX_SLOTS; ++i)
-    {
-      if( this->configs[this->currConfID].slots[i] == NULL)
-        return i;
-    }
-  return -1;
-}
-
-
+  PRINTF(3)("\tto %i\n", this->currConfID);
+}
+
+
+
+/**
+   \brief triggers fire of all weapons in the current weaponconfig
+*/
 void WeaponManager::fire()
 {
@@ -108 +125 @@
 
 
+/**
+   \brief triggers tick of all weapons in the current weaponconfig
+   \param second passed since last tick
+*/
 void WeaponManager::tick(float sec)
 {
@@ -119 +140 @@
 
 
+/**
+   \brief triggers draw of all weapons in the current weaponconfig
+*/
 void WeaponManager::draw()
 {
@@ -128 +152 @@
     }
 }
+
+
+/**
+   \brief private gets the next free slot in a certain weaponconfig
+   \param the selected weaponconfig
+*/
+int WeaponManager::getNextFreeSlot(int configID)
+{
+  for( int i = 0; i < W_MAX_SLOTS; ++i)
+    {
+      if( this->configs[configID].slots[i] == NULL)
+        return i;
+    }
+  return -1;
+}
+
+
+
+
+
 
 /**

orxonox/trunk/src/world_entities/weapon.h

@@ -79 +79 @@
   ~WeaponManager();
   
-  void addWeapon(Weapon* weapon, int slotID = W_FREE_SLOT, int configID = W_CONFIG0);
+  void addWeapon(Weapon* weapon, int configID = W_CONFIG0, int slotID = W_FREE_SLOT);
+  void removeWeapon(Weapon* weapon, int configID = W_CONFIG0);
   void nextWeaponConf();
 
@@ -92 +93 @@
   weaponConfig configs[4];              //<! a list of four configurations
   
-  int getNextFreeSlot();
+  int getNextFreeSlot(int configID);
 };