nchebrov/azerothcore-wotlk
1
0
Fork 0
mirror of https://github.com/mod-playerbots/azerothcore-wotlk.git synced 2026-01-17 10:55:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move area trigger storage from DBC to database (#742)

Browse Source 
Renamed AreaTrigger + related stuff to AreaTriggerTeleport
This commit is contained in:
Kaev
2018-01-02 22:08:08 +01:00
committed by Yehonal
parent b669d24a1f
commit 05cd8c8c61
43 changed files with 1431 additions and 124 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_baltharus_the_warborn.cpp
View File

@@ -450,7 +450,7 @@ class at_baltharus_plateau : public AreaTriggerScript
public:
at_baltharus_plateau() : AreaTriggerScript("at_baltharus_plateau") { }
bool OnTrigger(Player* player, AreaTriggerEntry const* /*areaTrigger*/)
bool OnTrigger(Player* player, AreaTrigger const* /*areaTrigger*/)
{
if (InstanceScript* instance = player->GetInstanceScript())
{

6
src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp
View File

@@ -1296,7 +1296,7 @@ class at_hor_shadow_throne : public AreaTriggerScript
public:
at_hor_shadow_throne() : AreaTriggerScript("at_hor_shadow_throne") { }
bool OnTrigger(Player* player, const AreaTriggerEntry* /*at*/)
bool OnTrigger(Player* player, const AreaTrigger* /*at*/)
{
if (player->IsGameMaster())
return false;
@@ -1996,7 +1996,7 @@ class at_hor_battered_hilt_start : public AreaTriggerScript
public:
at_hor_battered_hilt_start() : AreaTriggerScript("at_hor_battered_hilt_start") { }
bool OnTrigger(Player* player, AreaTriggerEntry const* /*areaTrigger*/)
bool OnTrigger(Player* player, AreaTrigger const* /*areaTrigger*/)
{
if (player->HasAura(70013))
if (InstanceScript* instance = player->GetInstanceScript())
@@ -2010,7 +2010,7 @@ class at_hor_battered_hilt_throw : public AreaTriggerScript
public:
at_hor_battered_hilt_throw() : AreaTriggerScript("at_hor_battered_hilt_throw") { }
bool OnTrigger(Player* player, AreaTriggerEntry const* /*areaTrigger*/)
bool OnTrigger(Player* player, AreaTrigger const* /*areaTrigger*/)
{
if (player->HasAura(70013))
if (InstanceScript* instance = player->GetInstanceScript())

2
src/server/scripts/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.cpp
View File

@@ -1556,7 +1556,7 @@ class at_tyrannus_event_starter : public AreaTriggerScript
public:
at_tyrannus_event_starter() : AreaTriggerScript("at_tyrannus_event_starter") { }
bool OnTrigger(Player* player, const AreaTriggerEntry* /*at*/)
bool OnTrigger(Player* player, const AreaTrigger* /*at*/)
{
InstanceScript* inst = player->GetInstanceScript();
if (!inst)

2
src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp
View File

@@ -1745,7 +1745,7 @@ class at_sindragosa_lair : public AreaTriggerScript
public:
at_sindragosa_lair() : AreaTriggerScript("at_sindragosa_lair") { }
bool OnTrigger(Player* player, AreaTriggerEntry const* /*areaTrigger*/)
bool OnTrigger(Player* player, AreaTrigger const* /*areaTrigger*/)
{
if (InstanceScript* instance = player->GetInstanceScript())
{

14
src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.cpp
View File

@@ -2245,7 +2245,7 @@ class at_icc_saurfang_portal : public AreaTriggerScript
public:
at_icc_saurfang_portal() : AreaTriggerScript("at_icc_saurfang_portal") { }
bool OnTrigger(Player* player, AreaTriggerEntry const* /*areaTrigger*/)
bool OnTrigger(Player* player, AreaTrigger const* /*areaTrigger*/)
{
InstanceScript* instance = player->GetInstanceScript();
if (!instance || instance->GetBossState(DATA_DEATHBRINGER_SAURFANG) != DONE)
@@ -2288,7 +2288,7 @@ class at_icc_shutdown_traps : public AreaTriggerScript
public:
at_icc_shutdown_traps() : AreaTriggerScript("at_icc_shutdown_traps") { }
bool OnTrigger(Player* player, AreaTriggerEntry const* /*areaTrigger*/)
bool OnTrigger(Player* player, AreaTrigger const* /*areaTrigger*/)
{
if (InstanceScript* instance = player->GetInstanceScript())
instance->SetData(DATA_COLDFLAME_JETS, DONE);
@@ -2301,7 +2301,7 @@ class at_icc_start_blood_quickening : public AreaTriggerScript
public:
at_icc_start_blood_quickening() : AreaTriggerScript("at_icc_start_blood_quickening") { }
bool OnTrigger(Player* player, AreaTriggerEntry const* /*areaTrigger*/)
bool OnTrigger(Player* player, AreaTrigger const* /*areaTrigger*/)
{
if (InstanceScript* instance = player->GetInstanceScript())
instance->SetData(DATA_BLOOD_QUICKENING_STATE, IN_PROGRESS);
@@ -2314,7 +2314,7 @@ class at_icc_start_frostwing_gauntlet : public AreaTriggerScript
public:
at_icc_start_frostwing_gauntlet() : AreaTriggerScript("at_icc_start_frostwing_gauntlet") { }
bool OnTrigger(Player* player, AreaTriggerEntry const* /*areaTrigger*/)
bool OnTrigger(Player* player, AreaTrigger const* /*areaTrigger*/)
{
if (InstanceScript* instance = player->GetInstanceScript())
if (instance->GetBossState(DATA_SISTER_SVALNA) != DONE)
@@ -3710,7 +3710,7 @@ class at_icc_gauntlet_event : public AreaTriggerScript
public:
at_icc_gauntlet_event() : AreaTriggerScript("at_icc_gauntlet_event") { }
bool OnTrigger(Player* player, AreaTriggerEntry const* /*areaTrigger*/)
bool OnTrigger(Player* player, AreaTrigger const* /*areaTrigger*/)
{
if (InstanceScript* instance = player->GetInstanceScript())
if (instance->GetBossState(DATA_SINDRAGOSA_GAUNTLET) == NOT_STARTED && !player->IsGameMaster())
@@ -3725,7 +3725,7 @@ class at_icc_putricide_trap : public AreaTriggerScript
public:
at_icc_putricide_trap() : AreaTriggerScript("at_icc_putricide_trap") { }
bool OnTrigger(Player* player, AreaTriggerEntry const* /*areaTrigger*/)
bool OnTrigger(Player* player, AreaTrigger const* /*areaTrigger*/)
{
if (InstanceScript* instance = player->GetInstanceScript())
if (instance->GetData(DATA_PUTRICIDE_TRAP_STATE) == NOT_STARTED && !player->IsGameMaster())
@@ -3740,7 +3740,7 @@ class at_icc_spire_frostwyrm : public AreaTriggerScript
public:
at_icc_spire_frostwyrm() : AreaTriggerScript("at_icc_spire_frostwyrm") { }
bool OnTrigger(Player* player, AreaTriggerEntry const* /*areaTrigger*/)
bool OnTrigger(Player* player, AreaTrigger const* /*areaTrigger*/)
{
if (Creature* frostwyrm = player->FindNearestCreature(NPC_SPIRE_FROSTWYRM, 150.0f, true))
if (frostwyrm->GetPositionZ() > 250.0f && frostwyrm->AI())

2
src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel_teleport.cpp
View File

@@ -64,7 +64,7 @@ class at_frozen_throne_teleport : public AreaTriggerScript
public:
at_frozen_throne_teleport() : AreaTriggerScript("at_frozen_throne_teleport") { }
bool OnTrigger(Player* player, AreaTriggerEntry const* /*areaTrigger*/)
bool OnTrigger(Player* player, AreaTrigger const* /*areaTrigger*/)
{
if (player->IsInCombat())
{

2
src/server/scripts/Northrend/Ulduar/Ulduar/ulduar.cpp
View File

@@ -465,7 +465,7 @@ class AreaTrigger_at_celestial_planetarium_enterance : public AreaTriggerScript
{
}
bool OnTrigger(Player* player, AreaTriggerEntry const* /*trigger*/)
bool OnTrigger(Player* player, AreaTrigger const* /*trigger*/)
{
if (player->IsAlive())
if (uint32 questId = (player->GetMap()->Is25ManRaid() ? 13816 : 13607 /*QUEST_CELESTIAL_PLANETARIUM*/))

2
src/server/scripts/Northrend/zone_dragonblight.cpp
View File

@@ -1033,7 +1033,7 @@ class at_q24545_frostmourne_cavern : public AreaTriggerScript
public:
at_q24545_frostmourne_cavern() : AreaTriggerScript("at_q24545_frostmourne_cavern") { }
bool OnTrigger(Player* player, AreaTriggerEntry const* /*areaTrigger*/)
bool OnTrigger(Player* player, AreaTrigger const* /*areaTrigger*/)
{
if (player->GetPhaseMask() & 2)
if (Creature* c = player->FindNearestCreature(NPC_SAC_LICH_KING, 60.0f, true))