Changeset 288 for code/branches/main_reto_vs05/src/weapon

Timestamp:

Nov 27, 2007, 11:49:42 PM (17 years ago)

Author:

rgrieder

Message:

• added Chai's HUD overlay
• abstracted debugOverlay —> TestOverlay
• added overlay media files
• cleaned up RunManager a little bit
• omitted using ogre's Singleton template
• added useful CMake structure
• some more things

Location:

code/branches/main_reto_vs05/src/weapon

Files:

• barrel_gun.cc (modified) (2 diffs)
• base_weapon.cc (moved) (moved from code/branches/main_reto_vs05/src/weapon/base_weapon.cpp) (2 diffs)
• weapon.h (deleted)

code/branches/main_reto_vs05/src/weapon/barrel_gun.cc

@@ -95 +95 @@
   void BarrelGun::primaryFiring(unsigned int time)
   {
-    if (time > 1000/primaryFiringRate_)
+    if (time > (unsigned int)1000/primaryFiringRate_)
     {
       currentState_ = IDLE;
@@ -133 +133 @@
   void BarrelGun::secondaryFiring(unsigned int time)
   {
-    if (time > 1000/secondaryFiringRate_)
+    if (time > (unsigned int)1000/secondaryFiringRate_)
       currentState_ = IDLE;
   }

code/branches/main_reto_vs05/src/weapon/base_weapon.cc

@@ -98 +98 @@
     }
 
-    switch (currentState_)
+    if (currentState_ != IDLE)
     {
-    case IDLE:
+      switch (currentState_)
+      {
+      case PRIMARY_FIRE:
+        primaryFiring((unsigned int)(time - actionStartTime_));
+        break;
+
+      case SECONDARY_FIRE:
+        secondaryFiring((unsigned int)(time - actionStartTime_));
+        break;
+
+      case RELOADING:
+        break;
+
+      case CHANGING_AMMO:
+        break;
+      }
+    }
+
+    if (currentState_ == IDLE)
+    {
       // first, process next action
       if (nextAction_ != NOTHING)
@@ -142 +161 @@
         }
       }
-
-      break;
-
-    case PRIMARY_FIRE:
-      primaryFiring((unsigned int)(time - actionStartTime_));
-      break;
-
-    case SECONDARY_FIRE:
-      secondaryFiring((unsigned int)(time - actionStartTime_));
-      break;
-
-    case RELOADING:
-      break;
-
-    case CHANGING_AMMO:
-      break;
     }