*Merge. (spell parts skipped)
--HG-- branch : trunk
This commit is contained in:
+1
-1
@@ -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;
|
||||
|
||||
Reference in New Issue
Block a user