Changeset 9958 in orxonox.OLD for branches/playability/src/world_entities/space_ships/space_ship.cc

Timestamp:

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

Author:

marcscha

Message:

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

File:

• branches/playability/src/world_entities/space_ships/space_ship.cc (modified) (3 diffs)

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)
   {