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

Timestamp:

11/19/08 13:40:10 (17 years ago)

Author:

yumileroy

Message:

[svn] Check creature combat reach when loading db. This should fix the bug that finding random contact point causes crash.

Original author: megamage
Date: 2008-11-01 16:53:16-05:00

Files:

• trunk/src/game/Unit.cpp (modified) (3 diffs)

trunk/src/game/Unit.cpp

@@ -406 +406 @@
 {
     assert(pVictim);
-    float reach = GetFloatValue(UNIT_FIELD_COMBATREACH);
-    if( reach <= 0.0f )
-        reach = 1.0f;
-    return IsWithinDistInMap(pVictim, reach);
+    return IsWithinDistInMap(pVictim, GetCombatReach());
 }
 
@@ -421 +418 @@
     float distsq = dx*dx + dy*dy + dz*dz;
     //not sure here, or combatreach + combatreach?
-    float sizefactor = GetFloatValue(UNIT_FIELD_COMBATREACH) + obj->GetFloatValue(UNIT_FIELD_COMBATREACH);
+    float sizefactor = GetCombatReach() + obj->GetCombatReach();
     float maxdist = dist2compare + sizefactor;
 
@@ -431 +428 @@
         uint32 attacker_number = getAttackers().size();
     if(attacker_number > 0) --attacker_number;
-        GetNearPoint(obj,x,y,z,obj->GetFloatValue(UNIT_FIELD_COMBATREACH),distance2dMin+(distance2dMax-distance2dMin)*rand_norm()
-        , GetAngle(obj) + (attacker_number ? (M_PI/2 - M_PI * rand_norm()) * (float)attacker_number / GetFloatValue(UNIT_FIELD_COMBATREACH) / 3 : 0));
+        GetNearPoint(obj,x,y,z,obj->GetCombatReach(), distance2dMin+(distance2dMax-distance2dMin)*rand_norm()
+        , GetAngle(obj) + (attacker_number ? (M_PI/2 - M_PI * rand_norm()) * (float)attacker_number / GetCombatReach() / 3 : 0));
 }