Merge branch 'master' into 303

Conflicts:
	contrib/extractor/System.cpp
	contrib/extractor/ad.exe
	src/game/WorldSocket.cpp
This commit is contained in:
tomrus88 2008-11-06 15:50:47 +03:00
commit 78ec66babc
78 changed files with 510 additions and 752 deletions

View file

@ -126,7 +126,7 @@ bool ChatHandler::HandleBuyErrorCommand(const char* args)
return true;
}
bool ChatHandler::HandleSendOpcodeCommand(const char* args)
bool ChatHandler::HandleSendOpcodeCommand(const char* /*args*/)
{
Unit *unit = getSelectedUnit();
if (!unit || (unit->GetTypeId() != TYPEID_PLAYER))
@ -267,7 +267,7 @@ bool ChatHandler::HandleSendQuestPartyMsgCommand(const char* args)
return true;
}
bool ChatHandler::HandleGetLootRecipient(const char* args)
bool ChatHandler::HandleGetLootRecipient(const char* /*args*/)
{
Creature* target = getSelectedCreature();
if(!target)