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

Timestamp:

Apr 18, 2005, 8:05:00 PM (19 years ago)

Author:

patrick

Message:

orxonox/trunk: weapon change enhanced. weapon handling is now better and safer

File:

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

orxonox/trunk/src/world_entities/player.cc

@@ -44 +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();
@@ -53 +52 @@
   //weapons:
   this->weaponMan = new WeaponManager();
-  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);
+  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->weapons->add(wpRight);
-  //this->activeWeapon = wpRight;
-  //this->activeWeaponL = wpLeft;
+  this->weaponMan->addWeapon(wpRight, W_CONFIG2);
+  this->weaponMan->addWeapon(wpLeft, W_CONFIG2);
+
 }