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

Timestamp:

Jul 24, 2005, 11:15:00 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: the new WeaponManager is online

File:

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

orxonox/trunk/src/world_entities/player.cc

@@ -49 +49 @@
   Weapon* wpLeft = new TestGun(this, Vector(-2.6, 0.1, -3.0), Quaternion(), 1);
 
-  this->weaponMan->addWeapon(wpRight, WM_CONFIG0, WM_SLOT0);
+  this->weaponMan->addWeapon(wpRight);
 //  this->weaponMan->addWeapon(wpLeft, WM_CONFIG1, WM_SLOT1);
 //  this->weaponMan->addWeapon(wpRight, WM_CONFIG2);
@@ -83 +83 @@
   Weapon* wpLeft = new TestGun(this, Vector(-2.6, 0.1, -3.0), Quaternion(), 1);
 
-  this->weaponMan->addWeapon(wpRight, WM_CONFIG0, WM_SLOT0);
-  this->weaponMan->addWeapon(wpLeft, WM_CONFIG1, WM_SLOT1);
-  this->weaponMan->addWeapon(wpRight, WM_CONFIG2);
-  this->weaponMan->addWeapon(wpLeft, WM_CONFIG2);
+  this->weaponMan->addWeapon(wpRight, 0,0);
+  this->weaponMan->addWeapon(wpLeft, 0, 1);
+  this->weaponMan->addWeapon(wpLeft, 1, 1);
+  this->weaponMan->addWeapon(wpRight, 2, 0);
+/*  this->weaponMan->addWeapon(wpRight, WM_CONFIG2);
+  this->weaponMan->addWeapon(wpLeft, WM_CONFIG2);*/
 }
 
@@ -96 +98 @@
   this->setClassID(CL_PLAYER, "Player");
 
-  this->model = (Model*)ResourceManager::getInstance()->load("models/reaplow.obj", OBJ, RP_CAMPAIGN);
+//  this->model = (Model*)ResourceManager::getInstance()->load("models/reaplow.obj", OBJ, RP_CAMPAIGN);
   travelSpeed = 15.0;
   velocity = new Vector();