Changeset 10686 in orxonox.OLD for branches/vs-enhencements/src

Timestamp:

Jun 12, 2007, 3:46:19 PM (18 years ago)

Author:

nicolasc

Message:

xfer

File:

• branches/vs-enhencements/src/world_entities/space_ships/space_ship.cc (modified) (4 diffs)

branches/vs-enhencements/src/world_entities/space_ships/space_ship.cc

@@ -462 +462 @@
       {
         int slot = ws->getWeaponSlot();
-        int side = ws->getWeaponSide(); //FIXME / REMOVE: is not used// HACK needed for some weapons (left/right)
+//        int side = ws->getWeaponSide(); //FIXME / REMOVE: is not used// HACK needed for some weapons (left/right)
         this->getWeaponManager().setSlotPosition(slot, (*it).second->getCenter());
         this->getWeaponManager().setSlotDirection(slot, ws->getRelDir());
@@ -684 +684 @@
   else
   {*/
-    this->setAbsCoor( this->getAbsCoor() + Vector(100,0,0) + Vector(1,0,0) * VECTOR_RAND(150).dot(Vector(1,0,0)));
+  //!< ancient test hack
+//     this->setAbsCoor( this->getAbsCoor() + Vector(100,0,0) + Vector(1,0,0) * VECTOR_RAND(150).dot(Vector(1,0,0)));
   //}
 
@@ -718 +719 @@
   for( unsigned int i=0; i < this->weaponMan.getSlotCount(); i++) {
     weapon = this->weaponMan.getWeapon(i);
-    if( weapon != NULL && weapon->isActive()) {
+    if( weapon != NULL) {
+      if (weapon->isActive() )
       weaponCount++;
     }
@@ -729 +731 @@
   for( unsigned int i=0; i < this->weaponMan.getSlotCount(); i++) {
     weapon = this->weaponMan.getWeapon(i);
-    if( weapon != NULL && weapon->isActive()) {
-      weapon->increaseEnergy( energy);
+    if( weapon != NULL) {
+      if (weapon->isActive() )
+        weapon->increaseEnergy( energy);
     }
   }