Changeset 11166 for code/branches/sagerjFS16/src/orxonox/weaponsystem/WeaponMode.cc

Timestamp:

Apr 14, 2016, 4:02:00 PM (9 years ago)

Author:

sagerj

Message:

today I got pawn'ed

File:

• code/branches/sagerjFS16/src/orxonox/weaponsystem/WeaponMode.cc (modified) (2 diffs)

code/branches/sagerjFS16/src/orxonox/weaponsystem/WeaponMode.cc

@@ -121 +121 @@
     {
         (*reloadTime) = this->reloadTime_;
-        
+        orxout() << "fire wm " << reloadTime << endl;
         // Fireing is only possible if this weapon mode is not reloading and there is enough munition
         if (!this->bReloading_ && this->munition_ && this->munition_->takeMunition(this->munitionPerShot_, this))
@@ -169 +169 @@
     }
 
-    void WeaponMode::release(float* reloadTime)
-    {orxout() << "release wmode " << reloadTime << endl;}
+    bool WeaponMode::release(float* reloadTime)
+    {
+        orxout() << "release wm " << reloadTime << endl;
+        return false;
+    }
 
     bool WeaponMode::reload()