Changeset 3877 in orxonox.OLD

Timestamp:

Apr 18, 2005, 5:34:39 PM (19 years ago)

Author:

patrick

Message:

orxonox/trunk: the player now works entirely with the WeaponManager. much more elegant! but its not yet finished.

Location:

orxonox/trunk/src/world_entities

Files:

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

orxonox/trunk/src/world_entities/player.cc

@@ -60 +60 @@
   this->weaponMan->addWeapon(wpLeft);
 
-  this->weapons->add(wpRight);
-  this->activeWeapon = wpRight;
-  this->activeWeaponL = wpLeft;
+  //this->weapons->add(wpRight);
+  //this->activeWeapon = wpRight;
+  //this->activeWeaponL = wpLeft;
 }
 
@@ -157 +157 @@
   glPopMatrix();
 
-  this->activeWeapon->draw();
-  this->activeWeaponL->draw();
+  //this->activeWeapon->draw();
+  //this->activeWeaponL->draw();
+  this->weaponMan->draw();
 }
 
@@ -169 +170 @@
 {
   /* 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);
@@ -186 +188 @@
   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);
@@ -216 +217 @@
   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->activeWeapon->deactivate();
       //this->weapons->enumerate();  FIX: strang weapon change...
-      this->activeWeapon = this->weapons->nextElement(this->activeWeapon);
-      this->activeWeapon->activate();
+      //this->activeWeapon = this->weapons->nextElement(this->activeWeapon);
+      //this->activeWeapon->activate();
+      this->weaponMan->nextWeaponConf();
     }
 }

orxonox/trunk/src/world_entities/weapon.cc

@@ -77 +77 @@
 void WeaponManager::nextWeaponConf() 
 {
+  PRINTF(3)("Changing weapon configuration: from %i ", this->currConfID);
   int i;
   for(i = this->currConfID; i < W_MAX_CONFIGS && !this->configs[i].bUsed; ++i);
   if( i == W_MAX_CONFIGS) this->currConfID = W_CONFIG0;
   else this->currConfID = i;  
+  PRINTF(3)("to %i\n", this->currConfID);
 }
 
@@ -105 +107 @@
 }
 
+
+void WeaponManager::tick(float sec)
+{
+  Weapon* w;
+  for(int i = 0; i < W_MAX_SLOTS; ++i)
+    {
+      w = this->configs[this->currConfID].slots[i];
+      if( w != NULL) w->tick(sec);
+    }
+}
+
+
+void WeaponManager::draw()
+{
+  Weapon* w;
+  for(int i = 0; i < W_MAX_SLOTS; ++i)
+    {
+      w = this->configs[this->currConfID].slots[i];
+      if( w != NULL) w->draw();
+    }
+}
 
 /**

orxonox/trunk/src/world_entities/weapon.h

@@ -83 +83 @@
 
   void fire();
+  void tick(float sec);
+  void draw();
 
  private: