Changeset 10543 in orxonox.OLD for trunk

Timestamp:

Jan 31, 2007, 5:22:27 AM (18 years ago)

Author:

nicolasc

Message:

fixed weapon switch bug

Location:

trunk/src/world_entities

Files:

• space_ships/space_ship.cc (modified) (1 diff)
• weapons/weapon_manager.cc (modified) (1 diff)

trunk/src/world_entities/space_ships/space_ship.cc

@@ -190 +190 @@
   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->weaponMan.addWeapon( wpLeft1, 3, 0);

trunk/src/world_entities/weapons/weapon_manager.cc

@@ -523 +523 @@
         dynamic_cast<Playable*>(this->parentEntity)->weaponConfigChanged();
     }
-    else if (unlikely(tickWeapon != NULL && tickWeapon->getCurrentState() == WS_DEACTIVATING))
-      this->currentSlotConfig[i]->setNextWeapon(NULL);
+//     else if (unlikely(tickWeapon != NULL && tickWeapon->getCurrentState() == WS_DEACTIVATING))
+//       this->currentSlotConfig[i]->setNextWeapon(NULL);
   }
 }