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

Timestamp:

Dec 6, 2006, 5:35:28 PM (17 years ago)

Author:

marcscha

Message:

Second Weapon Ammo Widget Support

File:

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

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

@@ -145 +145 @@
 
   Weapon* wpRight1 = new LightBlaster ();
-  wpRight1->setName("Light Blaster Right");
+  wpRight1->setName("LightBlaster");
   Weapon* wpLeft1 = new LightBlaster ();
-  wpLeft1->setName("Medium Blaster Left");
+  wpLeft1->setName("LightBlaster");
 
   Weapon* wpRight2 = new MediumBlaster ();
-  wpRight2->setName("Medium Blaster Right");
+  wpRight2->setName("MediumBlaster");
   Weapon* wpLeft2 = new MediumBlaster ();
-  wpLeft2->setName("Medium Blaster Left");
-
-/*  Weapon* wpRight3 = new HeavyBlaster ();
-  wpRight3->setName("Heavy Blaster Right");
+  wpLeft2->setName("MediumBlaster");
+
+  Weapon* wpRight3 = new HeavyBlaster ();
+  wpRight3->setName("HeavyBlaster");
   Weapon* wpLeft3 = new HeavyBlaster ();
-  wpLeft3->setName("Heavy Blaster Left");*/
+  wpLeft3->setName("HeavyBlaster");
 
   Weapon* cannon = new SwarmLauncher();
@@ -168 +168 @@
   this->weaponMan.addWeapon( wpLeft2, 0, 2);
   this->weaponMan.addWeapon( wpRight2, 0, 3);
-/*  this->weaponMan.addWeapon( wpLeft3, 0, 4);
-  this->weaponMan.addWeapon( wpRight3, 0, 5);*/
+  this->weaponMan.addWeapon( wpLeft3, 0, 4);
+  this->weaponMan.addWeapon( wpRight3, 0, 5);
 
   this->secWeaponMan.addWeapon( cannon, 1, 0);
@@ -180 +180 @@
   wpRight2->requestAction(WA_ACTIVATE);
   wpLeft2->requestAction(WA_ACTIVATE);
-/*  wpRight3->requestAction(WA_ACTIVATE);
-  wpLeft3->requestAction(WA_ACTIVATE);*/
+  wpRight3->requestAction(WA_ACTIVATE);
+  wpLeft3->requestAction(WA_ACTIVATE);
 
   cannon->requestAction(WA_ACTIVATE);