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

Timestamp:

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

Author:

patrick

Message:

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

File:

• orxonox/trunk/src/world_entities/player.cc (modified) (9 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;
+}