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

Timestamp:

Nov 24, 2005, 12:13:22 AM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the WorldEntities into the Trunk.
Merged with command:
svn merge branches/world_entities/ trunk/ -r5516:HEAD

conflics from world_entities changed in favor of branches/world_entity
all other conflict in favor of the trunk

File:

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

trunk/src/world_entities/player.cc

@@ -28 +28 @@
 #include "weapons/test_gun.h"
 #include "weapons/turret.h"
+#include "weapons/cannon.h"
 
 #include "list.h"
@@ -37 +38 @@
 using namespace std;
 
-CREATE_FACTORY(Player);
+CREATE_FACTORY(Player, CL_PLAYER);
 
 /**
@@ -46 +47 @@
 {
   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);
 }
 
@@ -88 +80 @@
 
   //weapons:
-  Weapon* wpRight = new TestGun(this->weaponMan, 0);
+  Weapon* wpRight = new TestGun(0);
   wpRight->setName("testGun Right");
-  Weapon* wpLeft = new TestGun(this->weaponMan, 1);
+  Weapon* wpLeft = new TestGun(1);
   wpLeft->setName("testGun Left");
+  Weapon* cannon = dynamic_cast<Weapon*>(Factory::getFirst()->fabricate(CL_CANNON));
+
+  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);
 
@@ -134 +131 @@
 
   this->weaponMan = new WeaponManager(this);
-  this->weaponMan->setSlotCount(10);
+  this->weaponMan->setSlotCount(7);
 
   this->weaponMan->setSlotPosition(0, Vector(-2.6, .1, -3.0));
@@ -153 +150 @@
   this->weaponMan->setSlotPosition(5, Vector(-1.5, -.5, -.5));
   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(8, Vector(-2.5, -0.3, -2.0));
-  this->weaponMan->setSlotDirection(8, Quaternion(-M_PI, Vector(1,0,0)));
-
-  this->weaponMan->setSlotPosition(9, Vector(-2.5, -0.3, 2.0));
-  this->weaponMan->setSlotDirection(9, Quaternion(+M_PI, Vector(1,0,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)));
+//
+//   this->weaponMan->setSlotPosition(9, Vector(-2.5, -0.3, 2.0));
+//   this->weaponMan->setSlotDirection(9, Quaternion(+M_PI, Vector(1,0,0)));:
+
 }
 
@@ -337 +335 @@
 }
 
+#include "weapons/aiming_turret.h"
 // FIXME THIS MIGHT BE CONSIDERED EITHER A FEATURE, OR A BUG
 void Player::ADDWEAPON()
 {
-  Weapon* turret1 = new Turret(this->weaponMan);
-  turret1->setName("Turret");
-  turret1->setStateDuration(WS_SHOOTING, (float)rand()/RAND_MAX*.5+.1);
-
-  this->weaponMan->addWeapon(turret1, 2);
-
-  this->weaponMan->changeWeaponConfig(2);
-}
+  Weapon* turret = NULL;
+
+  if ((float)rand()/RAND_MAX < .1)
+  {
+    //if (this->weaponMan->hasFreeSlot(2, WTYPE_TURRET))
+    {
+      turret = new Turret();
+      this->weaponMan->addWeapon(turret, 2);
+      this->weaponMan->changeWeaponConfig(2);
+    }
+  }
+  else
+  {
+    //if (this->weaponMan->hasFreeSlot(3))
+    {
+      turret = new AimingTurret();
+      this->weaponMan->addWeapon(turret, 3);
+
+      this->weaponMan->changeWeaponConfig(3);
+    }
+  }
+
+  if(turret != NULL)
+  {
+    turret->setName("Turret");
+    turret->setStateDuration(WS_SHOOTING, (float)rand()/RAND_MAX*.5+.1);
+  }
+}