Update some code for 322a
--HG-- branch : trunk
This commit is contained in:
+4
-6
@@ -237,8 +237,7 @@ class TRINITY_DLL_SPEC Object
|
||||
|
||||
bool HasFlag( uint16 index, uint32 flag ) const
|
||||
{
|
||||
if(index >= m_valuesCount && !PrintIndexError(index , false))
|
||||
return false;
|
||||
if( index >= m_valuesCount && !PrintIndexError( index , false ) ) return false;
|
||||
return (m_uint32Values[ index ] & flag) != 0;
|
||||
}
|
||||
|
||||
@@ -611,11 +610,11 @@ class TRINITY_DLL_SPEC WorldObject : public Object, public WorldLocation
|
||||
GameObject* SummonGameObject(uint32 entry, float x, float y, float z, float ang, float rotation0, float rotation1, float rotation2, float rotation3, uint32 respawnTime);
|
||||
Creature* SummonTrigger(float x, float y, float z, float ang, uint32 dur, CreatureAI* (*GetAI)(Creature*) = NULL);
|
||||
|
||||
Creature* FindNearestCreature(uint32 uiEntry, float fMaxSearchRange, bool bAlive = true);
|
||||
GameObject* FindNearestGameObject(uint32 uiEntry, float fMaxSearchRange);
|
||||
Creature* FindNearestCreature(uint32 entry, float range, bool alive = true);
|
||||
GameObject* FindNearestGameObject(uint32 entry, float range);
|
||||
|
||||
void GetCreatureListWithEntryInGrid(std::list<Creature*>& lList, uint32 uiEntry, float fMaxSearchRange);
|
||||
void GetGameObjectListWithEntryInGrid(std::list<GameObject*>& lList, uint32 uiEntry, float fMaxSearchRange);
|
||||
void GetCreatureListWithEntryInGrid(std::list<Creature*>& lList, uint32 uiEntry, float fMaxSearchRange);
|
||||
|
||||
void DestroyForNearbyPlayers();
|
||||
|
||||
@@ -655,4 +654,3 @@ class TRINITY_DLL_SPEC WorldObject : public Object, public WorldLocation
|
||||
uint32 m_phaseMask; // in area phase state
|
||||
};
|
||||
#endif
|
||||
|
||||
|
||||
Reference in New Issue
Block a user