Merge remote-tracking branch 'origin/master' into 4.3.4

Conflicts:
	src/server/game/Entities/Creature/GossipDef.cpp
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Entities/Player/Player.h
	src/server/game/Handlers/QuestHandler.cpp
	src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp
	src/server/scripts/EasternKingdoms/ZulAman/boss_halazzi.cpp
	src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp
	src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp
	src/server/scripts/EasternKingdoms/ZulAman/boss_nalorakk.cpp
	src/server/scripts/EasternKingdoms/ZulAman/boss_zuljin.cpp
	src/server/scripts/EasternKingdoms/ZulAman/instance_zulaman.cpp
	src/server/scripts/EasternKingdoms/ZulAman/zulaman.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_grilek.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_hakkar.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_hazzarah.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_jeklik.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_jindo.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_kilnara.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_marli.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_renataki.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_thekal.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_venoxis.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_wushoolay.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/instance_zulgurub.cpp
	src/server/scripts/EasternKingdoms/boss_kruul.cpp
	src/server/scripts/EasternKingdoms/zone_arathi_highlands.cpp
	src/server/scripts/EasternKingdoms/zone_burning_steppes.cpp
	src/server/scripts/EasternKingdoms/zone_ghostlands.cpp
	src/server/scripts/EasternKingdoms/zone_hinterlands.cpp
	src/server/scripts/EasternKingdoms/zone_ironforge.cpp
	src/server/scripts/EasternKingdoms/zone_loch_modan.cpp
	src/server/scripts/EasternKingdoms/zone_redridge_mountains.cpp
	src/server/scripts/EasternKingdoms/zone_silverpine_forest.cpp
	src/server/scripts/EasternKingdoms/zone_stormwind_city.cpp
	src/server/scripts/EasternKingdoms/zone_swamp_of_sorrows.cpp
	src/server/scripts/EasternKingdoms/zone_tirisfal_glades.cpp
	src/server/scripts/Kalimdor/zone_azshara.cpp
	src/server/scripts/Kalimdor/zone_darkshore.cpp
	src/server/scripts/Kalimdor/zone_desolace.cpp
	src/server/scripts/Kalimdor/zone_durotar.cpp
	src/server/scripts/Kalimdor/zone_felwood.cpp
	src/server/scripts/Kalimdor/zone_feralas.cpp
	src/server/scripts/Kalimdor/zone_mulgore.cpp
	src/server/scripts/Kalimdor/zone_orgrimmar.cpp
	src/server/scripts/Kalimdor/zone_stonetalon_mountains.cpp
	src/server/scripts/Kalimdor/zone_tanaris.cpp
	src/server/scripts/Kalimdor/zone_thousand_needles.cpp
	src/server/scripts/Kalimdor/zone_thunder_bluff.cpp
	src/server/scripts/Kalimdor/zone_ungoro_crater.cpp
	src/server/scripts/Northrend/zone_dalaran.cpp
	src/server/scripts/OutdoorPvP/OutdoorPvPEP.cpp
	src/server/scripts/Spells/spell_druid.cpp
	src/server/scripts/Spells/spell_generic.cpp
	src/server/scripts/Spells/spell_mage.cpp
	src/server/scripts/Spells/spell_paladin.cpp
	src/server/scripts/Spells/spell_priest.cpp
	src/server/scripts/Spells/spell_shaman.cpp
	src/server/scripts/Spells/spell_warlock.cpp
	src/server/scripts/Spells/spell_warrior.cpp
	src/server/scripts/World/item_scripts.cpp
This commit is contained in:
Nay committed 2013-07-14 16:10:20 +01:00
commit b56b282eee
603 files changed
+14632 -11728

No files matched your search

+1 -1
View File
@@ -33,7 +33,7 @@ class account_commandscript : public CommandScript
public:
account_commandscript() : CommandScript("account_commandscript") { }
ChatCommand* GetCommands() const
ChatCommand* GetCommands() const OVERRIDE
{
static ChatCommand accountSetCommandTable[] =
{
@@ -33,7 +33,7 @@ class achievement_commandscript : public CommandScript
public:
achievement_commandscript() : CommandScript("achievement_commandscript") { }
ChatCommand* GetCommands() const
ChatCommand* GetCommands() const OVERRIDE
{
static ChatCommand achievementCommandTable[] =
{
+15 -13
View File
@@ -34,7 +34,7 @@ class arena_commandscript : public CommandScript
public:
arena_commandscript() : CommandScript("arena_commandscript") { }
ChatCommand* GetCommands() const
ChatCommand* GetCommands() const OVERRIDE
{
static ChatCommand arenaCommandTable[] =
{
@@ -228,9 +228,9 @@ public:
if (!handler->extractPlayerTarget(nameStr, &target, &targetGuid))
return false;
ArenaTeam* Arena = sArenaTeamMgr->GetArenaTeamById(teamId);
ArenaTeam* arena = sArenaTeamMgr->GetArenaTeamById(teamId);
if (!Arena)
if (!arena)
{
handler->PSendSysMessage(LANG_ARENA_ERROR_NOT_FOUND, teamId);
handler->SetSentErrorMessage(true);
@@ -244,36 +244,38 @@ public:
return false;
}
if (Arena->IsFighting())
if (arena->IsFighting())
{
handler->SendSysMessage(LANG_ARENA_ERROR_COMBAT);
handler->SetSentErrorMessage(true);
return false;
}
if (!Arena->IsMember(targetGuid))
if (!arena->IsMember(targetGuid))
{
handler->PSendSysMessage(LANG_ARENA_ERROR_NOT_MEMBER, nameStr, Arena->GetName().c_str());
handler->PSendSysMessage(LANG_ARENA_ERROR_NOT_MEMBER, nameStr, arena->GetName().c_str());
handler->SetSentErrorMessage(true);
return false;
}
if (Arena->GetCaptain() == targetGuid)
if (arena->GetCaptain() == targetGuid)
{
handler->PSendSysMessage(LANG_ARENA_ERROR_CAPTAIN, nameStr, Arena->GetName().c_str());
handler->PSendSysMessage(LANG_ARENA_ERROR_CAPTAIN, nameStr, arena->GetName().c_str());
handler->SetSentErrorMessage(true);
return false;
}
Player* oldCaptain = sObjectMgr->GetPlayerByLowGUID(Arena->GetCaptain());
Arena->SetCaptain(targetGuid);
handler->PSendSysMessage(LANG_ARENA_CAPTAIN, Arena->GetName().c_str(), Arena->GetId(), oldCaptain->GetName().c_str(), target->GetName().c_str());
std::string oldCaptainName;
sObjectMgr->GetPlayerNameByGUID(arena->GetCaptain(), oldCaptainName);
arena->SetCaptain(targetGuid);
handler->PSendSysMessage(LANG_ARENA_CAPTAIN, arena->GetName().c_str(), arena->GetId(), oldCaptainName.c_str(), target->GetName().c_str());
if (handler->GetSession())
TC_LOG_DEBUG(LOG_FILTER_ARENAS, "GameMaster: %s [GUID: %u] promoted player: %s [GUID: %u] to leader of arena team \"%s\"[Id: %u]",
handler->GetSession()->GetPlayer()->GetName().c_str(), handler->GetSession()->GetPlayer()->GetGUIDLow(), target->GetName().c_str(), target->GetGUIDLow(), Arena->GetName().c_str(), Arena->GetId());
handler->GetSession()->GetPlayer()->GetName().c_str(), handler->GetSession()->GetPlayer()->GetGUIDLow(), target->GetName().c_str(), target->GetGUIDLow(), arena->GetName().c_str(), arena->GetId());
else
TC_LOG_DEBUG(LOG_FILTER_ARENAS, "Console: promoted player: %s [GUID: %u] to leader of arena team \"%s\"[Id: %u]",
target->GetName().c_str(), target->GetGUIDLow(), Arena->GetName().c_str(), Arena->GetId());
target->GetName().c_str(), target->GetGUIDLow(), arena->GetName().c_str(), arena->GetId());
return true;
}
+1 -1
View File
@@ -35,7 +35,7 @@ class ban_commandscript : public CommandScript
public:
ban_commandscript() : CommandScript("ban_commandscript") { }
ChatCommand* GetCommands() const
ChatCommand* GetCommands() const OVERRIDE
{
static ChatCommand unbanCommandTable[] =
{
+1 -1
View File
@@ -31,7 +31,7 @@ class bf_commandscript : public CommandScript
public:
bf_commandscript() : CommandScript("bf_commandscript") { }
ChatCommand* GetCommands() const
ChatCommand* GetCommands() const OVERRIDE
{
static ChatCommand battlefieldcommandTable[] =
{
+1 -1
View File
@@ -33,7 +33,7 @@ class cast_commandscript : public CommandScript
public:
cast_commandscript() : CommandScript("cast_commandscript") { }
ChatCommand* GetCommands() const
ChatCommand* GetCommands() const OVERRIDE
{
static ChatCommand castCommandTable[] =
{
+1 -1
View File
@@ -35,7 +35,7 @@ class character_commandscript : public CommandScript
public:
character_commandscript() : CommandScript("character_commandscript") { }
ChatCommand* GetCommands() const
ChatCommand* GetCommands() const OVERRIDE
{
static ChatCommand pdumpCommandTable[] =
{
+1 -1
View File
@@ -33,7 +33,7 @@ class cheat_commandscript : public CommandScript
public:
cheat_commandscript() : CommandScript("cheat_commandscript") { }
ChatCommand* GetCommands() const
ChatCommand* GetCommands() const OVERRIDE
{
static ChatCommand cheatCommandTable[] =
+1 -1
View File
@@ -40,7 +40,7 @@ class debug_commandscript : public CommandScript
public:
debug_commandscript() : CommandScript("debug_commandscript") { }
ChatCommand* GetCommands() const
ChatCommand* GetCommands() const OVERRIDE
{
static ChatCommand debugPlayCommandTable[] =
{
+1 -1
View File
@@ -43,7 +43,7 @@ public:
* @brief Returns the command structure for the system.
*/
ChatCommand* GetCommands() const
ChatCommand* GetCommands() const OVERRIDE
{
static ChatCommand deserterInstanceCommandTable[] =
{
+1 -1
View File
@@ -37,7 +37,7 @@ class disable_commandscript : public CommandScript
public:
disable_commandscript() : CommandScript("disable_commandscript") { }
ChatCommand* GetCommands() const
ChatCommand* GetCommands() const OVERRIDE
{
static ChatCommand removeDisableCommandTable[] =
{
+1 -1
View File
@@ -33,7 +33,7 @@ class event_commandscript : public CommandScript
public:
event_commandscript() : CommandScript("event_commandscript") { }
ChatCommand* GetCommands() const
ChatCommand* GetCommands() const OVERRIDE
{
static ChatCommand eventCommandTable[] =
{
+1 -1
View File
@@ -36,7 +36,7 @@ class gm_commandscript : public CommandScript
public:
gm_commandscript() : CommandScript("gm_commandscript") { }
ChatCommand* GetCommands() const
ChatCommand* GetCommands() const OVERRIDE
{
static ChatCommand gmCommandTable[] =
{
+1 -1
View File
@@ -35,7 +35,7 @@ class go_commandscript : public CommandScript
public:
go_commandscript() : CommandScript("go_commandscript") { }
ChatCommand* GetCommands() const
ChatCommand* GetCommands() const OVERRIDE
{
static ChatCommand goCommandTable[] =
{
+1 -1
View File
@@ -33,7 +33,7 @@ class honor_commandscript : public CommandScript
public:
honor_commandscript() : CommandScript("honor_commandscript") { }
ChatCommand* GetCommands() const
ChatCommand* GetCommands() const OVERRIDE
{
static ChatCommand honorAddCommandTable[] =
{
+1 -1
View File
@@ -35,7 +35,7 @@ class instance_commandscript : public CommandScript
public:
instance_commandscript() : CommandScript("instance_commandscript") { }
ChatCommand* GetCommands() const
ChatCommand* GetCommands() const OVERRIDE
{
static ChatCommand instanceCommandTable[] =
{
+1 -1
View File
@@ -36,7 +36,7 @@ class learn_commandscript : public CommandScript
public:
learn_commandscript() : CommandScript("learn_commandscript") { }
ChatCommand* GetCommands() const
ChatCommand* GetCommands() const OVERRIDE
{
static ChatCommand learnAllMyCommandTable[] =
{
+1 -1
View File
@@ -41,7 +41,7 @@ class lfg_commandscript : public CommandScript
public:
lfg_commandscript() : CommandScript("lfg_commandscript") { }
ChatCommand* GetCommands() const
ChatCommand* GetCommands() const OVERRIDE
{
static ChatCommand lfgCommandTable[] =
{
+1 -1
View File
@@ -36,7 +36,7 @@ class list_commandscript : public CommandScript
public:
list_commandscript() : CommandScript("list_commandscript") { }
ChatCommand* GetCommands() const
ChatCommand* GetCommands() const OVERRIDE
{
static ChatCommand listCommandTable[] =
{
+1 -1
View File
@@ -37,7 +37,7 @@ class lookup_commandscript : public CommandScript
public:
lookup_commandscript() : CommandScript("lookup_commandscript") { }
ChatCommand* GetCommands() const
ChatCommand* GetCommands() const OVERRIDE
{
static ChatCommand lookupPlayerCommandTable[] =
{
+1 -1
View File
@@ -42,7 +42,7 @@ class misc_commandscript : public CommandScript
public:
misc_commandscript() : CommandScript("misc_commandscript") { }
ChatCommand* GetCommands() const
ChatCommand* GetCommands() const OVERRIDE
{
static ChatCommand groupCommandTable[] =
{
+1 -1
View File
@@ -41,7 +41,7 @@ class mmaps_commandscript : public CommandScript
public:
mmaps_commandscript() : CommandScript("mmaps_commandscript") { }
ChatCommand* GetCommands() const
ChatCommand* GetCommands() const OVERRIDE
{
static ChatCommand mmapCommandTable[] =
{
+1 -1
View File
@@ -37,7 +37,7 @@ class modify_commandscript : public CommandScript
public:
modify_commandscript() : CommandScript("modify_commandscript") { }
ChatCommand* GetCommands() const
ChatCommand* GetCommands() const OVERRIDE
{
static ChatCommand modifyspeedCommandTable[] =
{
+1 -1
View File
@@ -74,7 +74,7 @@ class npc_commandscript : public CommandScript
public:
npc_commandscript() : CommandScript("npc_commandscript") { }
ChatCommand* GetCommands() const
ChatCommand* GetCommands() const OVERRIDE
{
static ChatCommand npcAddCommandTable[] =
{
+1 -1
View File
@@ -33,7 +33,7 @@ class quest_commandscript : public CommandScript
public:
quest_commandscript() : CommandScript("quest_commandscript") { }
ChatCommand* GetCommands() const
ChatCommand* GetCommands() const OVERRIDE
{
static ChatCommand questCommandTable[] =
{
+1 -1
View File
@@ -35,7 +35,7 @@ class reset_commandscript : public CommandScript
public:
reset_commandscript() : CommandScript("reset_commandscript") { }
ChatCommand* GetCommands() const
ChatCommand* GetCommands() const OVERRIDE
{
static ChatCommand resetCommandTable[] =
{
+1 -1
View File
@@ -35,7 +35,7 @@ class server_commandscript : public CommandScript
public:
server_commandscript() : CommandScript("server_commandscript") { }
ChatCommand* GetCommands() const
ChatCommand* GetCommands() const OVERRIDE
{
static ChatCommand serverIdleRestartCommandTable[] =
{
+1 -1
View File
@@ -35,7 +35,7 @@ class tele_commandscript : public CommandScript
public:
tele_commandscript() : CommandScript("tele_commandscript") { }
ChatCommand* GetCommands() const
ChatCommand* GetCommands() const OVERRIDE
{
static ChatCommand teleCommandTable[] =
{
+1 -1
View File
@@ -33,7 +33,7 @@ class titles_commandscript : public CommandScript
public:
titles_commandscript() : CommandScript("titles_commandscript") { }
ChatCommand* GetCommands() const
ChatCommand* GetCommands() const OVERRIDE
{
static ChatCommand titlesSetCommandTable[] =
{
+1 -1
View File
@@ -34,7 +34,7 @@ class wp_commandscript : public CommandScript
public:
wp_commandscript() : CommandScript("wp_commandscript") { }
ChatCommand* GetCommands() const
ChatCommand* GetCommands() const OVERRIDE
{
static ChatCommand wpCommandTable[] =
{