Changeset 9958 in orxonox.OLD

Timestamp:

Nov 26, 2006, 12:31:01 AM (17 years ago)

Author:

marcscha

Message:

Inline of damage get on projectile, part implementation of primary - secondary weapon and handling variables for the weapon manager

Location:

branches/playability/src/world_entities

Files:

• projectiles/projectile.cc (modified) (1 diff)
• projectiles/projectile.h (modified) (1 diff)
• space_ships/space_ship.cc (modified) (3 diffs)
• space_ships/space_ship.h (modified) (3 diffs)

branches/playability/src/world_entities/projectiles/projectile.cc

@@ -152 +152 @@
     this->soundSource.play(this->explosionBuffer);
 }
-
-int Projectile::getPhysDamage () { return this->physDamage; }
-
-int Projectile::getElecDamage () { return this->elecDamage; }

branches/playability/src/world_entities/projectiles/projectile.h

@@ -52 +52 @@
     inline bool tickLifeCycle(float dt ) { this->lifeCycle += dt/this->lifeSpan;  return(unlikely(this->lifeCycle >= 1)); }
 
-    virtual int getPhysDamage();
-    virtual int getElecDamage();
+    inline int getPhysDamage() { return this->physDamage; };
+    inline int getElecDamage() { return this->elecDamage; };
 
   protected:

branches/playability/src/world_entities/space_ships/space_ship.cc

@@ -177 +177 @@
   //registerEvent(SDLK_e);
   registerEvent(KeyMapper::PEV_FIRE1);
+  registerEvent(KeyMapper::PEV_FIRE2);                  // Added for secondary weapon support
   registerEvent(KeyMapper::PEV_NEXT_WEAPON);
   registerEvent(KeyMapper::PEV_PREVIOUS_WEAPON);
@@ -345 +346 @@
   }
 
+  // Shield Regeneration and other regular calculations on the ship 
+  this->regen(time);
+
 
   //   if( this != State::getPlayer()->getControllable())
@@ -503 +507 @@
   else if( event.type == KeyMapper::PEV_BACKWARD)
     this->bDown = event.bPressed; //this->shiftCoor(0,-.1,0);
+  else if( event.type == KeyMapper::PEV_FIRE1)
+    firedWeapon = curWeaponPrimary;
+  else if( event.type == KeyMapper::PEV_FIRE2)
+    firedWeapon = curWeaponSecondary;
   else if( event.type == EV_MOUSE_MOTION)
   {

branches/playability/src/world_entities/space_ships/space_ship.h

@@ -2 +2 @@
  * @file space_ship.h
  * Implements the Control of a Spaceship
+ * Space Ships are the core class for all types of ships in Orxonox
  */
 
@@ -57 +58 @@
     inline float getElectronicMax() { return this->electronicMax; }; //!< returns current electronic value
 
+    inline int getFiredWeapon() { return this->firedWeapon; };      //!< returns index of the fired weapon
+
     //damage handler
     virtual void damage(float pDamage, float eDamage);  //!< pDamage physical damage, eDamage electronic damage
@@ -95 +98 @@
     int         reactorCapacity;    //!< reactor capacity
 
+
+    int         curWeaponPrimary;   //!< current primary weapon
+    int         curWeaponSecondary; //!< current secondary weapon
+    int         firedWeapon;        //!< index of the fired weapon for the weapon manager
+
     bool                  bUp;                //!< up button pressed.
     bool                  bDown;              //!< down button pressed.