Changeset 3881 in orxonox.OLD for orxonox/trunk/src/world_entities/weapon.cc

Timestamp:

Apr 18, 2005, 8:05:00 PM (19 years ago)

Author:

patrick

Message:

orxonox/trunk: weapon change enhanced. weapon handling is now better and safer

File:

• orxonox/trunk/src/world_entities/weapon.cc (modified) (7 diffs)

orxonox/trunk/src/world_entities/weapon.cc

@@ -37 +37 @@
 WeaponManager::WeaponManager(int nrOfSlots) 
 {
-  this->nrOfSlots = nrOfSlots;
-  
   for(int i = 0; i < W_MAX_CONFIGS; ++i)
     {
@@ -45 +43 @@
         this->configs[i].slots[j] = NULL;
     }
-
+  this->nrOfSlots = nrOfSlots;
   this->currConfID = W_CONFIG0;
-  this->configs[this->currConfID].bUsed = true;
 }
 
@@ -53 +50 @@
 WeaponManager::~WeaponManager() 
 {
-  /* i dont have to delete the weapons itself, because they are 
+  /* 
+     i dont have to delete the weapons itself, because they are 
      worldentities and therefore in the entities list of the world
   */
+  for(int i = 0; i < W_MAX_CONFIGS; ++i)
+    {
+      this->configs[i].bUsed = false;
+      for(int j = 0; j < W_MAX_SLOTS; ++j)
+        this->configs[i].slots[j] = NULL;
+    }
 }
 
@@ -101 +105 @@
 
    if there are multiple weapon configurations defined by the manager, use this to switch between them
+   this function will deactivate the weapons first, change the config and reactivate them later
 */
 void WeaponManager::nextWeaponConf() 
 {
   PRINTF(4)("Changing weapon configuration: from %i\n", this->currConfID);
+
+  Weapon* w;
+  for(int i = 0; i < W_MAX_SLOTS; ++i)
+    {
+      w = this->configs[this->currConfID].slots[i];
+      if( w != NULL) w->deactivate();
+    }
   int i;
   for(i = this->currConfID + 1; i < W_MAX_CONFIGS && !this->configs[i].bUsed; ++i);
@@ -110 +122 @@
   else this->currConfID = i;  
   PRINTF(4)("\tto %i\n", this->currConfID);
+
+  for(int i = 0; i < W_MAX_SLOTS; ++i)
+    {
+      w = this->configs[this->currConfID].slots[i];
+      if( w != NULL) w->activate();
+    }
 }
 
@@ -181 +199 @@
    creates a new weapon
 */
-Weapon::Weapon (PNode* parent, Vector* coordinate, Quaternion* direction) 
+Weapon::Weapon (PNode* parent, const Vector& coordinate, const Quaternion& direction) 
   : WorldEntity()
 {
   parent->addChild(this, PNODE_ALL);
-  this->setRelCoor(*coordinate);
-  this->setRelDir(*direction);
+  this->setRelCoor(coordinate);
+  this->setRelDir(direction);
   WorldInterface* wi = WorldInterface::getInstance();
   this->worldEntities = wi->getEntityList();
@@ -293 +311 @@
 {}
 
-/**
-   \brief sets a weapon idle time
-   \param idle time in ms
-
-   a weapon idle time is the time spend after a shoot until the weapon can
-   shoot again
-*/
-void Weapon::setWeaponIdleTime(float time)
-{
-  this->idleTime = time;
-}
-
-/**
-   \brief gets the weapon idle time
-   \returns idle time in ms
-
-   a weapon idle time is the time spend after a shoot until the weapon can
-   shoot again
-*/
-float Weapon::getWeaponIdleTime(void)
-{
-  return this->idleTime;
-}
-
-/**
-   \brief checks if the idle time is elapsed
-   \return true if time is elapsed
-
-   a weapon idle time is the time spend after a shoot until the weapon can
-   shoot again
-*/
-bool Weapon::hasWeaponIdleTimeElapsed(void)
-{
-  return (this->localTime>this->idleTime)?true:false;
-}
-
-
-/**
-   \brief fires the weapon
-   
-   this is called from the player.cc, when fire-button is been pushed
-*/
-void Weapon::fire()
-{}
+
+
+