Changeset 231 for trunk/src/game/Unit.cpp

Timestamp:

11/19/08 13:48:54 (17 years ago)

Author:

yumileroy

Message:

[svn] Add UNIT_STAT_CASTING, and use it to update attack timer as test.

Original author: megamage
Date: 2008-11-14 17:42:00-06:00

Files:

• trunk/src/game/Unit.cpp (modified) (1 diff)

trunk/src/game/Unit.cpp

@@ -284 +284 @@
     }
 
-    if(uint32 base_att = getAttackTimer(BASE_ATTACK))
-        setAttackTimer(BASE_ATTACK, (p_time >= base_att ? 0 : base_att - p_time) );
-    if(uint32 ranged_att = getAttackTimer(RANGED_ATTACK))
-        setAttackTimer(RANGED_ATTACK, (p_time >= ranged_att ? 0 : ranged_att - p_time) );
-    if(uint32 off_att = getAttackTimer(OFF_ATTACK))
-        setAttackTimer(OFF_ATTACK, (p_time >= off_att ? 0 : off_att - p_time) );
+    if(!hasUnitState(UNIT_STAT_CASTING))
+    {
+        if(uint32 base_att = getAttackTimer(BASE_ATTACK))
+            setAttackTimer(BASE_ATTACK, (p_time >= base_att ? 0 : base_att - p_time) );
+        if(uint32 ranged_att = getAttackTimer(RANGED_ATTACK))
+            setAttackTimer(RANGED_ATTACK, (p_time >= ranged_att ? 0 : ranged_att - p_time) );
+        if(uint32 off_att = getAttackTimer(OFF_ATTACK))
+            setAttackTimer(OFF_ATTACK, (p_time >= off_att ? 0 : off_att - p_time) );
+    }
 
     // update abilities available only for fraction of time