Changeset 5621 in orxonox.OLD for branches/world_entities/src/world_entities/player.cc

Timestamp:

Nov 17, 2005, 12:31:14 AM (18 years ago)

Author:

bensch

Message:

orxonox/branches/world_entities: added new Class Weapon, that will once fire BOMBS

File:

• branches/world_entities/src/world_entities/player.cc (modified) (5 diffs)

branches/world_entities/src/world_entities/player.cc

@@ -26 +26 @@
 #include "weapons/test_gun.h"
 #include "weapons/turret.h"
+#include "weapons/cannon.h"
 
 #include "list.h"
@@ -45 +46 @@
 {
   this->init();
-
-  //weapons:
-  Weapon* wpRight = new TestGun(this->weaponMan, 0);
-  Weapon* wpLeft = new TestGun(this->weaponMan, 1);
-
-  this->weaponMan->addWeapon(wpRight);
-//  this->weaponMan->addWeapon(wpLeft, WM_CONFIG1, WM_SLOT1);
-//  this->weaponMan->addWeapon(wpRight, WM_CONFIG2);
-//  this->weaponMan->addWeapon(wpLeft, WM_CONFIG2);
 }
 
@@ -91 +83 @@
   Weapon* wpLeft = new TestGun(this->weaponMan, 1);
   wpLeft->setName("testGun Left");
+  Weapon* cannon = new Cannon(this->weaponMan);
+  cannon->setName("BFG");
 
   this->weaponMan->addWeapon(wpLeft, 1, 0);
   this->weaponMan->addWeapon(wpRight,1 ,1);
+  this->weaponMan->addWeapon(cannon, 0, 6);
+
   //this->weaponMan->addWeapon(turret, 3, 0);
 
@@ -133 +129 @@
 
   this->weaponMan = new WeaponManager(this);
-  this->weaponMan->setSlotCount(6);
+  this->weaponMan->setSlotCount(7);
 
   this->weaponMan->setSlotPosition(0, Vector(-2.6, .1, -3.0));
@@ -153 +149 @@
   this->weaponMan->setSlotDirection(5, Quaternion(+M_PI_4*.5-M_PI, Vector(1,0,0)));
 //
-//   this->weaponMan->setSlotPosition(6, Vector(-2.0, 0.1, -2.0));
-//   this->weaponMan->setSlotPosition(7, Vector(-2.0, 0.1, 2.0));
-//
+   this->weaponMan->setSlotPosition(6, Vector(-1, 0.0, 0));
+   this->weaponMan->setSlotCapability(6, WTYPE_ALLDIRS | WTYPE_DIRECTIONAL);
+   //
 //   this->weaponMan->setSlotPosition(8, Vector(-2.5, -0.3, -2.0));
 //   this->weaponMan->setSlotDirection(8, Quaternion(-M_PI, Vector(1,0,0)));