josh/TCPlayerbotCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

*Merge.

Browse Source 
--HG--
branch : trunk
This commit is contained in:
megamage
2009-04-12 16:46:59 -05:00
parent 9787e5f578 49ee13d556
commit f971caf4bf
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/bindings/scripts/scripts/zone/gruuls_lair/instance_gruuls_lair.cpp
+2 -2
View File
@@ -125,8 +125,8 @@ struct TRINITY_DLL_DECL instance_gruuls_lair : public ScriptedInstance
if(data == DONE) HandleGameObject(MaulgarDoor, true); if(data == DONE) HandleGameObject(MaulgarDoor, true);
Encounters[0] = data; break; Encounters[0] = data; break;
case DATA_GRUULEVENT: case DATA_GRUULEVENT:
if(data == IN_PROGRESS) HandleGameObject(GruulDoor, true); if(data == IN_PROGRESS) HandleGameObject(GruulDoor, false);
else HandleGameObject(GruulDoor, false); else HandleGameObject(GruulDoor, true);
Encounters[1] = data; break; Encounters[1] = data; break;
} }
src/game/Chat.h
-1
View File
@@ -562,7 +562,6 @@ class ChatHandler
GameObject* GetObjectGlobalyWithGuidOrNearWithDbGuid(uint32 lowguid,uint32 entry); GameObject* GetObjectGlobalyWithGuidOrNearWithDbGuid(uint32 lowguid,uint32 entry);
// Utility methods for commands // Utility methods for commands
void ShowTicket(uint64 guid, char const* text, char const* time);
bool LookupPlayerSearchCommand(QueryResult* result, int32 limit); bool LookupPlayerSearchCommand(QueryResult* result, int32 limit);
bool HandleBanListHelper(QueryResult* result); bool HandleBanListHelper(QueryResult* result);
bool HandleBanHelper(BanMode mode,char const* args); bool HandleBanHelper(BanMode mode,char const* args);