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

Timestamp:

Dec 6, 2006, 4:47:06 PM (17 years ago)

Author:

marcscha

Message:

little modifications to swarm launcher

File:

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

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

@@ -26 +26 @@
 #include "weapons/medium_blaster.h"
 #include "weapons/heavy_blaster.h"
-#include "weapons/swarm_missile.h"
+#include "weapons/swarm_launcher.h"
 #include "weapons/boomerang_gun.h"
 #include "weapons/turret.h"
@@ -154 +154 @@
   wpLeft2->setName("Medium Blaster Left");
 
-  Weapon* wpRight3 = new HeavyBlaster ();
+/*  Weapon* wpRight3 = new HeavyBlaster ();
   wpRight3->setName("Heavy Blaster Right");
   Weapon* wpLeft3 = new HeavyBlaster ();
-  wpLeft3->setName("Heavy Blaster Left");
-
-  Weapon* cannon = new SwarmMissile();
-  cannon->setName("Swarm Missile");
+  wpLeft3->setName("Heavy Blaster Left");*/
+
+  Weapon* cannon = new SwarmLauncher();
+  cannon->setName("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->secWeaponMan.addWeapon( cannon, 0, 0);
+/*  this->weaponMan.addWeapon( wpLeft3, 0, 4);
+  this->weaponMan.addWeapon( wpRight3, 0, 5);*/
+
+  this->secWeaponMan.addWeapon( cannon, 1, 0);
 
   this->weaponMan.changeWeaponConfig(0);
+  this->secWeaponMan.changeWeaponConfig(1);
 
   wpRight1->requestAction(WA_ACTIVATE);
@@ -179 +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);
@@ -369 +370 @@
   registerVar( new SynchronizeableFloat( &cameraLook, &cameraLook, "cameraLook", PERMISSION_OWNER ) );
   registerVar( new SynchronizeableFloat( &rotation, &rotation, "rotation", PERMISSION_OWNER ) );
+  registerVar( new SynchronizeableBool( &bFire, &bFire, "bSecFire", PERMISSION_OWNER));
 
   registerVar( new SynchronizeableVector( &velocity, &velocity, "velocity", PERMISSION_MASTER_SERVER ) );