Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-24 02:46:33 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4

Browse Source 
Conflicts:
	src/server/game/Achievements/AchievementMgr.cpp
This commit is contained in:
Vincent-Michael
2013-09-22 15:31:21 +02:00
parent fb997c5f41 56b3e52f06
commit f2dff3da38
26 changed files with 960 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/server/scripts/EasternKingdoms/ScarletEnclave/chapter5.cpp
View File

@@ -311,6 +311,23 @@ public:
{
npc_highlord_darion_mograineAI(Creature* creature) : npc_escortAI(creature)
{
uiTirionGUID = 0;
uiKorfaxGUID = 0;
uiMaxwellGUID = 0;
uiEligorGUID = 0;
uiRayneGUID = 0;
uiKoltiraGUID = 0;
uiOrbazGUID = 0;
uiThassarianGUID = 0;
uiLichKingGUID = 0;
memset(uiDefenderGUID, 0, sizeof(uiDefenderGUID));
memset(uiEarthshatterGUID, 0, sizeof(uiEarthshatterGUID));
memset(uiAbominationGUID, 0, sizeof(uiAbominationGUID));
memset(uiBehemothGUID, 0, sizeof(uiBehemothGUID));
memset(uiGhoulGUID, 0, sizeof(uiGhoulGUID));
memset(uiWarriorGUID, 0, sizeof(uiWarriorGUID));
Reset();
}

12
src/server/scripts/World/achievement_scripts.cpp
View File

@@ -279,6 +279,17 @@ class achievement_flirt_with_disaster_perf_check : public AchievementCriteriaScr
}
};
class achievement_killed_exp_or_honor_target : public AchievementCriteriaScript
{
public:
achievement_killed_exp_or_honor_target() : AchievementCriteriaScript("achievement_killed_exp_or_honor_target") { }
bool OnCheck(Player* player, Unit* target) OVERRIDE
{
return target && player->isHonorOrXPTarget(target);
}
};
void AddSC_achievement_scripts()
{
new achievement_resilient_victory();
@@ -298,4 +309,5 @@ void AddSC_achievement_scripts()
new achievement_tilted();
new achievement_not_even_a_scratch();
new achievement_flirt_with_disaster_perf_check();
new achievement_killed_exp_or_honor_target();
}