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

Timestamp:

Apr 8, 2005, 12:46:33 AM (20 years ago)

Author:

patrick

Message:

orxonox/trunk: now got two weapons firing syncronized

File:

• orxonox/trunk/src/world_entities/player.cc (modified) (4 diffs)

orxonox/trunk/src/world_entities/player.cc

@@ -53 +53 @@
   acceleration = 10.0;
   //weapons:
-  Weapon* wp = new TestGun(this, new Vector(-2.6, 0.1, 3.0), new Quaternion());
-  this->weapons->add(wp);
-  this->activeWeapon = wp;  
+  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;
 }
 
@@ -150 +152 @@
 
   this->activeWeapon->draw();
+  this->activeWeaponL->draw();
 }
 
@@ -161 +164 @@
   /* link tick to weapon */
   this->activeWeapon->tick(time);
+  this->activeWeaponL->tick(time); //FIX FIX DELETE REMOVE
   // player controlled movement
   this->move(time);
@@ -206 +210 @@
   if( this->bFire)
     {
-      if(this->activeWeapon != NULL)
-        this->activeWeapon->fire();
+      //if(this->activeWeapon != NULL)
+      this->activeWeapon->fire();
+      //FIX THIS FIX FIIIIIIIIIIIX
+      this->activeWeaponL->fire();
     }
   if( this->bWeaponChange && this->weapons->getSize() > 1)