Merge branch 'master' into 4.3.4
Conflicts: src/server/game/AI/EventAI/CreatureEventAI.h src/server/game/AI/EventAI/CreatureEventAIMgr.h src/server/game/Achievements/AchievementMgr.cpp src/server/game/DungeonFinding/LFGMgr.h src/server/game/Entities/Creature/Creature.h src/server/game/Entities/Object/Updates/UpdateData.cpp src/server/game/Entities/Player/Player.cpp src/server/game/Entities/Player/Player.h src/server/game/Grids/Notifiers/GridNotifiers.h src/server/game/Grids/ObjectGridLoader.h src/server/game/Spells/SpellInfo.h src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp src/server/scripts/EasternKingdoms/ZulAman/boss_zuljin.cpp src/server/scripts/EasternKingdoms/ZulAman/zulaman.cpp src/server/scripts/EasternKingdoms/ZulGurub/boss_jeklik.cpp src/server/scripts/EasternKingdoms/ZulGurub/boss_jindo.cpp src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp src/server/scripts/EasternKingdoms/zone_burning_steppes.cpp src/server/scripts/EasternKingdoms/zone_hinterlands.cpp src/server/scripts/EasternKingdoms/zone_silverpine_forest.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_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/tools/map_extractor/System.cpp src/tools/map_extractor/mpq_libmpq.cpp src/tools/map_extractor/mpq_libmpq04.h src/tools/vmap4_extractor/loadlib/loadlib.h src/tools/vmap4_extractor/mpq_libmpq.cpp src/tools/vmap4_extractor/mpq_libmpq04.h
This commit is contained in:
commit
990e4c7851
484 files changed
+3938
-2160
No files matched your search
@@ -210,7 +210,11 @@ class AreaTrigger_at_last_rites : public AreaTriggerScript
|
||||
pPosition = WorldLocation(571, 3802.38f, 3585.95f, 49.5765f, 0.0f);
|
||||
break;
|
||||
case 5340:
|
||||
pPosition = WorldLocation(571, 3687.91f, 3577.28f, 473.342f, 0.0f);
|
||||
if (player->GetQuestStatus(QUEST_LAST_RITES) == QUEST_STATUS_INCOMPLETE ||
|
||||
player->GetQuestStatus(QUEST_LAST_RITES) == QUEST_STATUS_COMPLETE)
|
||||
pPosition = WorldLocation(571, 3687.91f, 3577.28f, 473.342f);
|
||||
else
|
||||
pPosition = WorldLocation(571, 3739.38f, 3567.09f, 341.58f);
|
||||
break;
|
||||
default:
|
||||
return false;
|
||||
|
||||
@@ -157,7 +157,7 @@ public:
|
||||
SpawnAssociation* SpawnAssoc;
|
||||
uint64 SpawnedGUID;
|
||||
|
||||
void Reset() OVERRIDE {}
|
||||
void Reset() OVERRIDE { }
|
||||
|
||||
Creature* SummonGuard()
|
||||
{
|
||||
@@ -341,7 +341,7 @@ public:
|
||||
me->RemoveFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_QUESTGIVER);
|
||||
}
|
||||
|
||||
void EnterCombat(Unit* /*who*/) OVERRIDE {}
|
||||
void EnterCombat(Unit* /*who*/) OVERRIDE { }
|
||||
|
||||
void UpdateAI(uint32 diff) OVERRIDE
|
||||
{
|
||||
@@ -458,7 +458,7 @@ public:
|
||||
}
|
||||
}
|
||||
|
||||
void EnterCombat(Unit* /*who*/)OVERRIDE {}
|
||||
void EnterCombat(Unit* /*who*/)OVERRIDE { }
|
||||
|
||||
void ReceiveEmote(Player* player, uint32 emote) OVERRIDE
|
||||
{
|
||||
@@ -687,7 +687,7 @@ public:
|
||||
|
||||
void UpdateAI(uint32 diff) OVERRIDE;
|
||||
|
||||
void EnterCombat(Unit* /*who*/) OVERRIDE {}
|
||||
void EnterCombat(Unit* /*who*/) OVERRIDE { }
|
||||
};
|
||||
|
||||
bool OnQuestAccept(Player* player, Creature* creature, Quest const* quest) OVERRIDE
|
||||
@@ -753,7 +753,7 @@ public:
|
||||
}
|
||||
}
|
||||
|
||||
void EnterCombat(Unit* /*who*/)OVERRIDE {}
|
||||
void EnterCombat(Unit* /*who*/)OVERRIDE { }
|
||||
|
||||
void SpellHit(Unit* caster, SpellInfo const* spell) OVERRIDE
|
||||
{
|
||||
@@ -936,7 +936,7 @@ public:
|
||||
me->SetHealth(me->CountPctFromMaxHealth(70));
|
||||
}
|
||||
|
||||
void EnterCombat(Unit* /*who*/) OVERRIDE {}
|
||||
void EnterCombat(Unit* /*who*/) OVERRIDE { }
|
||||
|
||||
void SpellHit(Unit* caster, SpellInfo const* spell) OVERRIDE
|
||||
{
|
||||
@@ -1494,8 +1494,8 @@ public:
|
||||
{
|
||||
npc_steam_tonkAI(Creature* creature) : ScriptedAI(creature) { }
|
||||
|
||||
void Reset() OVERRIDE {}
|
||||
void EnterCombat(Unit* /*who*/) OVERRIDE {}
|
||||
void Reset() OVERRIDE { }
|
||||
void EnterCombat(Unit* /*who*/) OVERRIDE { }
|
||||
|
||||
void OnPossess(bool apply)
|
||||
{
|
||||
@@ -1542,9 +1542,9 @@ public:
|
||||
ExplosionTimer = 3000;
|
||||
}
|
||||
|
||||
void EnterCombat(Unit* /*who*/) OVERRIDE {}
|
||||
void AttackStart(Unit* /*who*/) OVERRIDE {}
|
||||
void MoveInLineOfSight(Unit* /*who*/) OVERRIDE {}
|
||||
void EnterCombat(Unit* /*who*/) OVERRIDE { }
|
||||
void AttackStart(Unit* /*who*/) OVERRIDE { }
|
||||
void MoveInLineOfSight(Unit* /*who*/) OVERRIDE { }
|
||||
|
||||
|
||||
void UpdateAI(uint32 diff) OVERRIDE
|
||||
@@ -1673,7 +1673,7 @@ public:
|
||||
}
|
||||
}
|
||||
|
||||
void MoveInLineOfSight(Unit* /*who*/) OVERRIDE {}
|
||||
void MoveInLineOfSight(Unit* /*who*/) OVERRIDE { }
|
||||
};
|
||||
|
||||
CreatureAI* GetAI(Creature* creature) const OVERRIDE
|
||||
@@ -2387,7 +2387,7 @@ public:
|
||||
me->GetMotionMaster()->MoveFollow(owner, PET_FOLLOW_DIST, PET_FOLLOW_ANGLE);
|
||||
}
|
||||
|
||||
void EnterCombat(Unit* /*who*/) OVERRIDE {}
|
||||
void EnterCombat(Unit* /*who*/) OVERRIDE { }
|
||||
|
||||
void DoAction(int32 /*param*/) OVERRIDE
|
||||
{
|
||||
|
||||
Reference in new issue
Block a user