Changeset 10539 in orxonox.OLD for trunk/src/world_entities/space_ships/space_ship.cc

Timestamp:

Jan 31, 2007, 4:27:32 AM (17 years ago)

Author:

marcscha

Message:

Fixes for weapon systems

File:

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

trunk/src/world_entities/space_ships/space_ship.cc

@@ -190 +190 @@
   this->weaponMan.addWeapon( wpRight1, 0, 1);
 
-  this->weaponMan.addWeapon( wpLeft2, 1, 2);
-  this->weaponMan.addWeapon( wpRight2, 1, 3);
-
-  this->weaponMan.addWeapon( wpLeft3, 2, 4);
-  this->weaponMan.addWeapon( wpRight3, 2, 5);
+  this->weaponMan.addWeapon( wpLeft2, 1, 0);
+  this->weaponMan.addWeapon( wpRight2, 1, 1);
+
+  this->weaponMan.addWeapon( wpLeft3, 2, 0);
+  this->weaponMan.addWeapon( wpRight3, 2, 1);
 
   this->weaponMan.addWeapon( wpLeft1, 3, 0);
@@ -235 +235 @@
   engineEnergyShare = 0.4;
 
-  shieldCur         = 20;
+  shieldCur         = 100;
   shieldMax         = 100;
   shieldTH          = .2 * shieldMax;   // shield power must be 20% before shield kicks in again
 
-  this->setHealth( 20);
+  this->setHealth( 100);
   this->setHealthMax( 100);
 
@@ -507 +507 @@
   glMultMatrixf((float*)matrix);
   //glScalef(2.0, 2.0, 2.0);  // no double rescale
-        // FIXME