nchebrov/azerothcore-wotlk
1
0
Fork 0
mirror of https://github.com/mod-playerbots/azerothcore-wotlk.git synced 2026-01-22 05:06:24 +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

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)