*Merge.

--HG-- branch : trunk
2009-01-31 13:58:33 -06:00
parent be27bd230c 1f2292af79
commit d20eaef1d6
273 changed files with 544 additions and 650 deletions
@@ -637,7 +637,7 @@ class TRINITY_DLL_SPEC Creature : public Unit
 		bool IsFormationLeader() {return (GetDBTableGUIDLow() && GetDBTableGUIDLow() == m_formationID);}
 		uint32 GetFormationID(){return m_formationID;}

-        Unit *SelectHostilTarget();
+        Unit *SelectVictim();
 	protected:
        bool CreateFromProto(uint32 guidlow,uint32 Entry,uint32 team, const CreatureData *data = NULL);
        bool InitEntry(uint32 entry, uint32 team=ALLIANCE, const CreatureData* data=NULL);