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

Conflicts:
	src/server/game/Battlegrounds/Battleground.cpp
	src/server/game/Battlegrounds/Battleground.h
	src/server/game/DataStores/DBCEnums.h
	src/server/game/Entities/Player/Player.h
	src/server/game/Globals/ObjectMgr.cpp
	src/server/game/Miscellaneous/SharedDefines.h
	src/server/game/Quests/QuestDef.cpp
	src/server/game/Quests/QuestDef.h
	src/server/game/Server/Protocol/Opcodes.cpp
	src/server/game/Server/Protocol/Opcodes.h
	src/server/scripts/Commands/cs_reload.cpp
This commit is contained in:
Nay committed 2012-12-27 17:52:11 +00:00
commit 91136ea55f
47 files changed
+20690 -112

No files matched your search

+2 -5
View File
@@ -15239,7 +15239,7 @@ void Player::RewardQuest(Quest const* quest, uint32 reward, Object* questGiver,
_SaveQuestStatus(trans);
if (announce)
SendQuestReward(quest, XP, questGiver);
SendQuestReward(quest, XP);
// cast spells after mark quest complete (some spells have quest completed state requirements in spell_area data)
if (quest->GetRewSpellCast() > 0)
@@ -16436,7 +16436,7 @@ void Player::SendQuestComplete(Quest const* quest)
}
}
void Player::SendQuestReward(Quest const* quest, uint32 XP, Object* questGiver)
void Player::SendQuestReward(Quest const* quest, uint32 XP)
{
uint32 questId = quest->GetQuestId();
sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Sent SMSG_QUESTGIVER_QUEST_COMPLETE quest = %u", questId);
@@ -16470,9 +16470,6 @@ void Player::SendQuestReward(Quest const* quest, uint32 XP, Object* questGiver)
data.FlushBits();
GetSession()->SendPacket(&data);
if (quest->GetQuestCompleteScript() != 0)
GetMap()->ScriptsStart(sQuestEndScripts, quest->GetQuestCompleteScript(), questGiver, this);
}
void Player::SendQuestFailed(uint32 questId, InventoryResult reason)