Changeset 3585 in orxonox.OLD for orxonox/trunk/src/world_entities

Timestamp:

Mar 16, 2005, 11:59:51 PM (20 years ago)

Author:

patrick

Message:

orxonox/trunk: player now implements weapon change and fire

Location:

orxonox/trunk/src/world_entities

Files:

• player.cc (modified) (5 diffs)
• player.h (modified) (1 diff)

orxonox/trunk/src/world_entities/player.cc

@@ -33 +33 @@
   this->model = new OBJModel("../data/models/reaplow.obj");
   this->weapons = new tList<Weapon>();
+  this->activeWeapon = NULL;
+
+  travelSpeed = 15.0;
+  velocity = Vector();
+  bUp = bDown = bLeft = bRight = bAscend = bDescend = false;
+  bFire = false;
+  acceleration = 10.0;
 }
 
@@ -47 +54 @@
     }
   delete this->weapons;
+  
+  //delete this->velocity;
 }
 
@@ -75 +84 @@
 void Player::postSpawn ()
 {
-  travelSpeed = 15.0;
-  velocity = Vector();
-  bUp = bDown = bLeft = bRight = bAscend = bDescend = false;
-  bFire = false;
-  acceleration = 10.0;
   //setCollision(new CollisionCluster(1.0, Vector(0,0,0)));
 }
@@ -182 +186 @@
   if(this->bFire)
     {
-
+      if(this->activeWeapon != NULL)
+        this->activeWeapon->fire();
     }
   if(this->bWeaponChange)
     {
-
+      Weapon* w = this->weapons->enumerate(); 
+      this->activeWeapon = this->weapons->nextElement(this->activeWeapon);
     }
 }
@@ -199 +205 @@
 void Player::command (Command* cmd)
 {
-  //printf("Player|recieved command [%s]\n", cmd->cmd);
+  PRINTF(3)("recieved command [%s]\n", cmd->cmd);
   if( !strcmp( cmd->cmd, "up")) this->bUp = !cmd->bUp;
   else if( !strcmp( cmd->cmd, "down")) this->bDown = !cmd->bUp;

orxonox/trunk/src/world_entities/player.h

@@ -43 +43 @@
   bool bDescend;         //!< descend button presses.
   bool bFire;            //!< fire button pressed.
-  bool bWeaponChange;     //!< weapon change button pressed
+  bool bWeaponChange;    //!< weapon change button pressed
 
   tList<Weapon>* weapons;//!< a list of weapon
+  Weapon* activeWeapon;  //!< the weapon that is currenty activated
 
   Vector velocity;       //!< the velocity of the player.