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

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

File:

• orxonox/trunk/src/world_entities/player.cc (modified) (2 diffs)

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)