Revert last rev and fix in correct way. Also some clean up after merge

--HG--
branch : trunk
This commit is contained in:
Kudlaty committed 2009-08-17 01:10:34 +02:00
1 parent 418b161bdc
commit 48e6997453
3 files changed
+2 -1142

No files matched your search

+1 -2
View File
@@ -88,9 +88,8 @@ struct TRINITY_DLL_DECL npc_escortAI : public ScriptedAI
bool IsBeingEscorted;
bool IsOnHold;
uint64 m_uiPlayerGUID;
private:
uint64 m_uiPlayerGUID;
uint32 m_uiWPWaitTimer;
uint32 m_uiPlayerCheckTimer;
float MaxPlayerDistance;