mirror of
https://github.com/mangosfour/server.git
synced 2025-12-14 16:37:01 +00:00
Merge branch 'master' into 303
Conflicts: contrib/extractor/System.cpp contrib/extractor/ad.exe src/game/WorldSocket.cpp
This commit is contained in:
commit
78ec66babc
78 changed files with 510 additions and 752 deletions
|
|
@ -159,7 +159,7 @@ bool ChatHandler::HandleReloadAllItemCommand(const char*)
|
|||
return true;
|
||||
}
|
||||
|
||||
bool ChatHandler::HandleReloadAllLocalesCommand(const char* args)
|
||||
bool ChatHandler::HandleReloadAllLocalesCommand(const char* /*args*/)
|
||||
{
|
||||
HandleReloadLocalesCreatureCommand("a");
|
||||
HandleReloadLocalesGameobjectCommand("a");
|
||||
|
|
@ -170,7 +170,7 @@ bool ChatHandler::HandleReloadAllLocalesCommand(const char* args)
|
|||
return true;
|
||||
}
|
||||
|
||||
bool ChatHandler::HandleReloadConfigCommand(const char* arg)
|
||||
bool ChatHandler::HandleReloadConfigCommand(const char* /*args*/)
|
||||
{
|
||||
sLog.outString( "Re-Loading config settings..." );
|
||||
sWorld.LoadConfigSettings(true);
|
||||
|
|
@ -5756,7 +5756,7 @@ bool ChatHandler::HandleCastBackCommand(const char* args)
|
|||
caster->BuildHeartBeatMsg(&data);
|
||||
caster->SendMessageToSet(&data,true);
|
||||
|
||||
caster->CastSpell(m_session->GetPlayer(),spell,false);
|
||||
caster->CastSpell(m_session->GetPlayer(),spell,triggered);
|
||||
|
||||
return true;
|
||||
}
|
||||
|
|
@ -5847,7 +5847,7 @@ bool ChatHandler::HandleCastTargetCommand(const char* args)
|
|||
caster->BuildHeartBeatMsg(&data);
|
||||
caster->SendMessageToSet(&data,true);
|
||||
|
||||
caster->CastSpell(caster->getVictim(),spell,false);
|
||||
caster->CastSpell(caster->getVictim(),spell,triggered);
|
||||
|
||||
return true;
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue