Changeset 3585 in orxonox.OLD

Timestamp:

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

Author:

patrick

Message:

orxonox/trunk: player now implements weapon change and fire

Location:

orxonox/trunk/src

Files:

• lib/util/list.h (modified) (4 diffs)
• world_entities/player.cc (modified) (5 diffs)
• world_entities/player.h (modified) (1 diff)

orxonox/trunk/src/lib/util/list.h

@@ -86 +86 @@
   T* enumerate();
   T* nextElement();
+  T* nextElement(T* toEntity);
   T* toArray();
   void debug();
@@ -199 +200 @@
 T* tList<T>::enumerate()
 {
-  if(this->size == 0) return NULL;
+  if(this->last == this->first) return NULL;
   this->currentEl = this->first;
   return this->currentEl->curr;
@@ -208 +209 @@
 T* tList<T>::nextElement()
 {
-  if(this->size == 0) return NULL;
+  if(this->last == this->first) return NULL;
   this->currentEl = this->currentEl->next;
   if(this->currentEl == NULL) return NULL;
@@ -215 +216 @@
 
 
+/**
+   \brief this returns the next element after toEntity or the first if toEntity is last
+*/
+template<class T>
+T* tList<T>::nextElement(T* toEntity)
+{
+  if( this->last == this->first) return NULL;
+  if( toEntity == NULL) return this->first->curr;
+  if( toEntity == this->last->curr ) return this->first->curr;
+  this->currentEl = this->first;
+  while(this->currentEl->curr != toEntity && this->currentEl->next != NULL)
+    {
+      this->currentEl = this->currentEl->next;
+    }
+  if(this->currentEl == NULL) return NULL;
+  return this->currentEl->next->curr;
+}
+
+
 template<class T>
 T* tList<T>::toArray()

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.