diff options
| author | megamage <none@none> | 2009-06-01 15:02:58 -0500 |
|---|---|---|
| committer | megamage <none@none> | 2009-06-01 15:02:58 -0500 |
| commit | 999b49201a61f0ca86fbe84be58d462a0dc80461 (patch) | |
| tree | 082de208272d57f5a6be417681209b9be31066d6 /src/game | |
| parent | 9cadc5d1476e6aa3253d5f581cc1ef0fabb04a61 (diff) | |
| parent | dd9939942413318c773ad126492e7731fe17a7b7 (diff) | |
*Merge. (spell parts skipped)
--HG--
branch : trunk
Diffstat (limited to 'src/game')
| -rw-r--r-- | src/game/Object.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/game/Object.h b/src/game/Object.h index 50533e4a509..0e08247aece 100644 --- a/src/game/Object.h +++ b/src/game/Object.h @@ -431,7 +431,7 @@ class TRINITY_DLL_SPEC WorldObject : public Object float GetObjectSize() const { - return ( m_valuesCount > UNIT_FIELD_BOUNDINGRADIUS ) ? m_floatValues[UNIT_FIELD_BOUNDINGRADIUS] : DEFAULT_WORLD_OBJECT_SIZE; + return ( m_valuesCount > UNIT_FIELD_COMBATREACH ) ? m_floatValues[UNIT_FIELD_COMBATREACH] : DEFAULT_WORLD_OBJECT_SIZE; } bool IsPositionValid() const; void UpdateGroundPositionZ(float x, float y, float &z) const; |