Changeset 10740 in orxonox.OLD for branches/presentation/src/world_entities/space_ships

Timestamp:

Jun 20, 2007, 8:00:41 PM (17 years ago)

Author:

rennerc

Message:

less collision hacks

File:

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

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

@@ -178 +178 @@
 
 
- /* this->weaponMan.addWeaponToSlot(0, 0, "RFCannon");
+  this->weaponMan.addWeaponToSlot(0, 0, "RFCannon");
   this->weaponMan.addWeaponToSlot(0, 1, "RFCannon");
   this->weaponMan.addWeaponToSlot(0, 2, "RFCannon");
@@ -185 +185 @@
   this->weaponMan.addWeaponToSlot(1, 1, "RFCannon");
   this->weaponMan.addWeaponToSlot(1, 2, "RFCannon");
-  this->weaponMan.addWeaponToSlot(1, 3, "RFCannon");*/
+  this->weaponMan.addWeaponToSlot(1, 3, "RFCannon");
 
 /*  this->weaponMan.addWeaponToSlot(0, 4, "NadionLaser");
   this->weaponMan.addWeaponToSlot(0, 5, "NadionLaser");
   this->weaponMan.addWeaponToSlot(2, 4, "NadionLaser");
-  this->weaponMan.addWeaponToSlot(2, 5, "NadionLaser");*/
+  this->weaponMan.addWeaponToSlot(2, 5, "NadionLaser");
 
   this->weaponMan.addWeaponToSlot(0, 6, "Disruptor");
   this->weaponMan.addWeaponToSlot(0, 7, "Disruptor");
   this->weaponMan.addWeaponToSlot(3, 6, "Disruptor");
-  this->weaponMan.addWeaponToSlot(3, 7, "Disruptor");
+  this->weaponMan.addWeaponToSlot(3, 7, "Disruptor");*/