Changeset 3618 in orxonox.OLD for orxonox/trunk/src/world_entities/player.cc

Timestamp:

Mar 21, 2005, 3:26:26 PM (19 years ago)

Author:

patrick

Message:

orxonox/trunk: adding TestGun to implement a test gun some smaller changes in ghe weapon.h interface. some doxytags for primitive

File:

• orxonox/trunk/src/world_entities/player.cc (modified) (1 diff)

orxonox/trunk/src/world_entities/player.cc

@@ -192 +192 @@
 void Player::fire()
 {
-  if(this->bFire)
+  if( this->bFire)
     {
       if(this->activeWeapon != NULL)
         this->activeWeapon->fire();
     }
-  if(this->bWeaponChange)
+  if( this->bWeaponChange && this->weapons->getSize() > 1)
     {
-      Weapon* w = this->weapons->enumerate(); 
+      PRINTF(1)("changing the weapon of the player: deactivate old, activate new\n");
+      this->activeWeapon->deactivate();
+      this->weapons->enumerate(); 
       this->activeWeapon = this->weapons->nextElement(this->activeWeapon);
+      this->activeWeapon->activate();
     }
 }