Changeset 6804 in orxonox.OLD for trunk/src/world_entities/creatures

Timestamp:

Jan 28, 2006, 11:29:03 AM (19 years ago)

Author:

bensch

Message:

trunk: remastered Playables a bit

Location:

trunk/src/world_entities/creatures

Files:

• md2_creature.cc (modified) (7 diffs)
• md2_creature.h (modified) (2 diffs)

trunk/src/world_entities/creatures/md2_creature.cc

@@ -39 +39 @@
 
 CREATE_FACTORY(MD2Creature, CL_MD2_CREATURE);
-
-/**
- *  creates the controlable MD2Creature
- */
-MD2Creature::MD2Creature()
-{
-  this->init();
-}
 
 /**
@@ -231 +223 @@
 void MD2Creature::collidesWith(WorldEntity* entity, const Vector& location)
 {
-  if (entity->isA(CL_TURRET_POWER_UP) )
-  {
-    this->ADDWEAPON();
-    }
-//  PRINTF(3)("collision %s vs %s @ (%f,%f,%f)\n", this->getClassName(), entity->getClassName(), location.x, location.y, location.z);
+
 }
 
@@ -254 +242 @@
 void MD2Creature::tick (float time)
 {
+  Playable::tick(time);
   if( likely(this->getModel(0) != NULL))
     ((MD2Model*)this->getModel(0))->tick(time);
@@ -284 +273 @@
   this->setAbsDir(mouseDirX);
   this->cameraConnNode.setRelDir(mouseDirY);
-
-  this->getWeaponManager()->tick(time);
-  // weapon system manipulation
-  this->weaponAction();
 }
 
@@ -348 +333 @@
 
 
-/**
- * weapon manipulation by the player
-*/
-void MD2Creature::weaponAction()
-{
-  if( this->bFire)
-    {
-      this->getWeaponManager()->fire();
-    }
-}
 
 /**
@@ -364 +339 @@
 void MD2Creature::process(const Event &event)
 {
+  Playable::process(event);
   if( event.type == SDLK_a)
       this->bStrafeL = event.bPressed;
   else if( event.type == SDLK_d)
       this->bStrafeR = event.bPressed;
-  else if( event.type == KeyMapper::PEV_FIRE1)
-      this->bFire = event.bPressed;
-  else if( event.type == KeyMapper::PEV_NEXT_WEAPON && event.bPressed)
-    this->getWeaponManager()->nextWeaponConfig();//if( !event.bPressed) this->bWeaponChange = !this->bWeaponChange;
-  else if ( event.type == KeyMapper::PEV_PREVIOUS_WEAPON && event.bPressed)
-    this->getWeaponManager()->previousWeaponConfig();
   else if( event.type == SDLK_w)
     this->bUp = event.bPressed; //this->shiftCoor(0,.1,0);
@@ -390 +360 @@
   }
 }
-
-#include "weapons/aiming_turret.h"
-// FIXME THIS MIGHT BE CONSIDERED EITHER A FEATURE, OR A BUG
-void MD2Creature::ADDWEAPON()
-{
-  Weapon* turret = NULL;
-
-  if ((float)rand()/RAND_MAX < .1)
-  {
-    //if (this->getWeaponManager()->hasFreeSlot(2, WTYPE_TURRET))
-    {
-      turret = new Turret();
-      this->getWeaponManager()->addWeapon(turret, 2);
-      this->getWeaponManager()->changeWeaponConfig(2);
-    }
-  }
-  else
-  {
-    //if (this->getWeaponManager()->hasFreeSlot(3))
-    {
-      turret = new AimingTurret();
-      this->getWeaponManager()->addWeapon(turret, 3);
-
-      this->getWeaponManager()->changeWeaponConfig(3);
-    }
-  }
-
-  if(turret != NULL)
-  {
-    turret->setName("Turret");
-    turret->setStateDuration(WS_SHOOTING, (float)rand()/RAND_MAX*.5+.1);
-  }
-}

trunk/src/world_entities/creatures/md2_creature.h

@@ -19 +19 @@
   public:
 
-    MD2Creature();
     MD2Creature(const char* fileName);
-    MD2Creature(const TiXmlElement* root);
+    MD2Creature(const TiXmlElement* root = NULL);
     virtual ~MD2Creature();
 
-    void init();
     virtual void loadParams(const TiXmlElement* root);
 
@@ -42 +40 @@
 
   private:
+    void init();
 
     void calculateVelocity(float time);
-    void weaponAction();
-
-    // !! temporary !!
-    void ADDWEAPON();
 
     bool                  bUp;                //!< up button pressed.