Changeset 680 for code/branches/FICN/src/orxonox/objects/weapon_system/WeaponStation.cc

Timestamp:

Dec 24, 2007, 12:10:18 AM (16 years ago)

Author:

rgrieder

Message:

• removed some gcc warnings in weapon system

File:

• code/branches/FICN/src/orxonox/objects/weapon_system/WeaponStation.cc (modified) (2 diffs)

code/branches/FICN/src/orxonox/objects/weapon_system/WeaponStation.cc

@@ -42 +42 @@
 
   WeaponStation::WeaponStation(int stationSize)
-        : stationSize_(stationSize), lastActiveSlotIndex_(-1),
-        slots_(new BaseWeapon*[stationSize])
+        : slots_(new BaseWeapon*[stationSize]),
+          lastActiveSlotIndex_(-1), stationSize_(stationSize)
   {
         //slots_ = new BaseWeapon*[stationSize];
@@ -59 +59 @@
   bool WeaponStation::addWeapon(BaseWeapon *weapon)
   {
-    if (lastActiveSlotIndex_ = stationSize_ - 1)
+    if (lastActiveSlotIndex_ == stationSize_ - 1)
       return false;