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

Timestamp:

Oct 25, 2005, 5:31:54 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: power-ups implemented (simple-mode)

File:

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

trunk/src/world_entities/player.cc

@@ -92 +92 @@
   wpLeft->setName("testGun Left");
 
-  Weapon* turret1 = new Turret(this->weaponMan);
-  turret1->setName("Turret1");
-  turret1->setStateDuration(WS_SHOOTING, .2);
-  Weapon* turret2 = new Turret(this->weaponMan);
-  turret2->setName("Turret2");
-  turret2->setStateDuration(WS_SHOOTING, .3);
-  Weapon* turret3 = new Turret(this->weaponMan);
-  turret3->setName("Turret3");
-  turret3->setStateDuration(WS_SHOOTING, .17);
-
-  Weapon* turret4 = new Turret(this->weaponMan);
-  turret4->setName("Turret4");
-  turret4->setStateDuration(WS_SHOOTING, .3);
-
-
   this->weaponMan->addWeapon(wpLeft, 1, 0);
   this->weaponMan->addWeapon(wpRight,1 ,1);
-  this->weaponMan->addWeapon(turret1, 2, 2);
-  this->weaponMan->addWeapon(turret2, 2, 3);
-  this->weaponMan->addWeapon(turret3, 2, 4);
-  this->weaponMan->addWeapon(turret4, 2, 5);
-
   //this->weaponMan->addWeapon(turret, 3, 0);
 
-  this->weaponMan->changeWeaponConfig(0);
+  this->weaponMan->changeWeaponConfig(1);
 }
 
@@ -153 +133 @@
 
   this->weaponMan = new WeaponManager(this);
-  this->weaponMan->setSlotCount(6);
+  this->weaponMan->setSlotCount(10);
 
   this->weaponMan->setSlotPosition(0, Vector(-2.6, .1, -3.0));
@@ -171 +151 @@
   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)));
+
 }
 
@@ -222 +211 @@
 
 
-
-/**
- *  if the player is hit, call this function
- * @param weapon hit by this weapon
- * @param loc ??
-*/
-void Player::hit (WorldEntity* weapon, Vector* loc)
-{
-}
-
-
-/**
-  *  Collision with another Entity has this effect
-  * @param other the other colider
-  * @param ownhitflags ??
-  * @param otherhitflags ??
-*/
-void Player::collide (WorldEntity* other, Uint32 ownhitflags, Uint32 otherhitflags)
-{
-}
-
+WorldEntity* ref = NULL;
+/**
+ *  this function is called, when two entities collide
+ * @param entity: the world entity with whom it collides
+ *
+ * Implement behaviour like damage application or other miscellaneous collision stuff in this function
+ */
+void Player::collidesWith(WorldEntity* entity, const Vector& location)
+{
+  if (entity->isA(CL_TURRET_POWER_UP) && entity != ref)
+  {
+    this->ADDWEAPON();
+    ref = entity;
+    }
+//  PRINTF(3)("collision %s vs %s @ (%f,%f,%f)\n", this->getClassName(), entity->getClassName(), location.x, location.y, location.z);
+}
 
 /**
@@ -343 +327 @@
     this->weaponMan->previousWeaponConfig();
 }
+
+// FIXME THIS MIGHT BE CONSIDERED EITHER A FEATURE, OR A BUG
+int slot = 2;
+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, slot++);
+
+  this->weaponMan->changeWeaponConfig(2);
+}