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

Timestamp:

Jul 25, 2005, 12:22:24 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: Slots are now PNodes

File:

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

orxonox/trunk/src/world_entities/player.cc

@@ -46 +46 @@
 
   //weapons:
-  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);
+  Weapon* wpRight = new TestGun(0);
+  Weapon* wpLeft = new TestGun(1);
 
   this->weaponMan->addWeapon(wpRight);
@@ -80 +80 @@
 
   //weapons:
-  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, 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);*/
+  Weapon* wpRight = new TestGun(0);
+  wpRight->setName("testGun Right");
+  Weapon* wpLeft = new TestGun(1);
+  wpLeft->setName("testGun Left");
+
+  this->weaponMan->addWeapon(wpLeft, 1, 0);
+  this->weaponMan->addWeapon(wpRight,1 ,1);
+  this->weaponMan->addWeapon(wpLeft, 3, 1);
+
+  this->weaponMan->changeWeaponConfig(0);
 }
 
@@ -107 +108 @@
 
 
-  this->weaponMan = new WeaponManager(2);
+  this->weaponMan = new WeaponManager(this);
+  this->weaponMan->setSlotPosition(0, Vector(-2.6, .1, -3.0));
+  this->weaponMan->setSlotPosition(1, Vector(-2.6, .1, 3.0));
+
 }