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

Timestamp:

Dec 20, 2006, 1:09:05 PM (18 years ago)

Author:

marcscha

Message:

Deactivate Fix

File:

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

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

@@ -144 +144 @@
   this->registerObject(this, SpaceShip::_objectList);
   PRINTF(4)("SPACESHIP INIT\n");
-
+  this->weaponMan.setParentEntity( this);
   //weapons:
   
@@ -175 +175 @@
   this->weaponMan.addWeapon( wpLeft1, 0, 0);
   this->weaponMan.addWeapon( wpRight1, 0, 1);
-  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( wpLeft2, 1, 2);
+  this->weaponMan.addWeapon( wpRight2, 1, 3);
+
+  this->weaponMan.addWeapon( wpLeft3, 2, 4);
+  this->weaponMan.addWeapon( wpRight3, 2, 5);
 
   this->secWeaponMan.addWeapon( cannon, 0, 0);
 
-/*
-  wpRight1->requestAction(WA_ACTIVATE);
-  wpLeft1->requestAction(WA_ACTIVATE);
-
-  wpRight2->requestAction(WA_ACTIVATE);
-  wpLeft2->requestAction(WA_ACTIVATE);
-  wpRight3->requestAction(WA_ACTIVATE);
-  wpLeft3->requestAction(WA_ACTIVATE);
-
-  cannon->requestAction(WA_ACTIVATE);
-*/
   
   this->weaponMan.changeWeaponConfig(1);