Changeset 3953 in orxonox.OLD for orxonox/branches/physics/src/world_entities/player.cc

Timestamp:

Apr 25, 2005, 9:29:41 AM (19 years ago)

Author:

patrick

Message:

orxonox/branches/physics: merged with trunk - with command svn merge -r 3866:HEAD

File:

• orxonox/branches/physics/src/world_entities/player.cc (modified) (10 diffs)

orxonox/branches/physics/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
@@ -46 +44 @@
   */
   this->model = (Model*)ResourceManager::getInstance()->load("models/reaplow.obj", OBJ, RP_CAMPAIGN);
-  //this->model = (Model*)ResourceManager::getInstance()->load("models/weapon_packet.obj", OBJ, RP_CAMPAIGN);
   travelSpeed = 15.0;
   velocity = new Vector();
   bUp = bDown = bLeft = bRight = bAscend = bDescend = false;
   bFire = false;
+  this->bWeaponChange = false;
   acceleration = 10.0;
   //weapons:
-  Weapon* wpRight = new TestGun(this, new Vector(-2.6, 0.1, 3.0), new Quaternion(), 0);
-  Weapon* wpLeft = new TestGun(this, new Vector(-2.6, 0.1, -3.0), new Quaternion(), 1);
-  this->weapons->add(wpRight);
-  this->activeWeapon = wpRight;
-  this->activeWeaponL = wpLeft;
+  this->weaponMan = new WeaponManager();
+  Weapon* wpRight = new TestGun(this,Vector(-2.6, 0.1, 3.0), Quaternion(), 0);
+  Weapon* wpLeft = new TestGun(this, Vector(-2.6, 0.1, -3.0), Quaternion(), 1);
+  
+  this->weaponMan->addWeapon(wpRight, W_CONFIG0);
+  this->weaponMan->addWeapon(wpLeft, W_CONFIG1);
+  this->weaponMan->addWeapon(wpRight, W_CONFIG2);
+  this->weaponMan->addWeapon(wpLeft, W_CONFIG2);
+
 }
 
@@ -69 +71 @@
      this only frees the memory allocated to save the list.
   */
-  delete this->weapons;
+  delete this->weaponMan;
 }
 
@@ -79 +81 @@
 void Player::addWeapon(Weapon* weapon)
 {
-  this->weapons->add(weapon);
+  this->weaponMan->addWeapon(weapon);
 }
 
@@ -89 +91 @@
 void Player::removeWeapon(Weapon* weapon)
 {
-  this->weapons->remove(weapon);
+  this->weaponMan->removeWeapon(weapon);
 }
 
@@ -151 +153 @@
   glPopMatrix();
 
-  this->activeWeapon->draw();
-  this->activeWeaponL->draw();
+  this->weaponMan->draw();
 }
 
@@ -163 +164 @@
 {
   /* link tick to weapon */
-  this->activeWeapon->tick(time);
-  this->activeWeaponL->tick(time); //FIX FIX DELETE REMOVE
+  //this->activeWeapon->tick(time);
+  //this->activeWeaponL->tick(time); //FIX FIX DELETE REMOVE
+  this->weaponMan->tick(time);
   // player controlled movement
   this->move(time);
@@ -180 +182 @@
   Vector accel(0.0, 0.0, 0.0);
   /* FIXME: calculating the direction and orthDirection every timeSlice is redundant! save it somewhere */
-  
   /* calculate the direction in which the craft is heading  */
   Vector direction (1.0, 0.0, 0.0);
@@ -210 +211 @@
   if( this->bFire)
     {
-      //if(this->activeWeapon != NULL)
-      this->activeWeapon->fire();
-      //FIX THIS FIX FIIIIIIIIIIIX
-      this->activeWeaponL->fire();
+      this->weaponMan->fire();
     }
-  if( this->bWeaponChange && this->weapons->getSize() > 1)
+  if( this->bWeaponChange)
     {
-      PRINTF(1)("changing the weapon of the player: deactivate old, activate new\n");
-      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;
     }
 }
@@ -240 +235 @@
   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;
+}