[1755] Make AreaTriggerEntry passed in script call const. Patch by zergtmn

zergtmn · NoFantasy · commit 8a25b2f33eee · 2010-08-02T06:20:23.000Z
Make AreaTriggerEntry passed in script call const. Patch by zergtmn git-svn-id: https://scriptdev2.svn.sourceforge.net/svnroot/scriptdev2@1755 5f9c896b-1e26-0410-94da-f77f675e2462
diff --git a/ScriptMgr.cpp b/ScriptMgr.cpp
@@ -462,7 +462,7 @@ bool GOChooseReward(Player* pPlayer, GameObject* pGo, const Quest* pQuest, uint3
 }
 
 MANGOS_DLL_EXPORT
-bool AreaTrigger(Player* pPlayer, AreaTriggerEntry * atEntry)
+bool AreaTrigger(Player* pPlayer, AreaTriggerEntry const* atEntry)
 {
     Script *tmpscript = m_scripts[GetAreaTriggerScriptId(atEntry->id)];
 
diff --git a/ScriptMgr.h b/ScriptMgr.h
@@ -55,7 +55,7 @@ struct Script
     bool (*pChooseReward            )(Player*, Creature*, const Quest*, uint32);
     bool (*pItemHello               )(Player*, Item*, const Quest*);
     bool (*pGOHello                 )(Player*, GameObject*);
-    bool (*pAreaTrigger             )(Player*, AreaTriggerEntry*);
+    bool (*pAreaTrigger             )(Player*, AreaTriggerEntry const*);
     bool (*pProcessEventId          )(uint32, Object*, Object*, bool);
     bool (*pItemQuestAccept         )(Player*, Item*, const Quest*);
     bool (*pGOQuestAccept           )(Player*, GameObject*, const Quest*);
diff --git a/scripts/eastern_kingdoms/blackrock_depths/blackrock_depths.cpp b/scripts/eastern_kingdoms/blackrock_depths/blackrock_depths.cpp
@@ -83,7 +83,7 @@ static uint32 RingBoss[]=
     9032,                                                   // Hedrum
 };
 
-bool AreaTrigger_at_ring_of_law(Player* pPlayer, AreaTriggerEntry* pAt)
+bool AreaTrigger_at_ring_of_law(Player* pPlayer, AreaTriggerEntry const* pAt)
 {
     if (ScriptedInstance* pInstance = (ScriptedInstance*)pPlayer->GetInstanceData())
     {
diff --git a/scripts/eastern_kingdoms/blackrock_spire/instance_blackrock_spire.cpp b/scripts/eastern_kingdoms/blackrock_spire/instance_blackrock_spire.cpp
@@ -265,7 +265,7 @@ InstanceData* GetInstanceData_instance_blackrock_spire(Map* pMap)
     return new instance_blackrock_spire(pMap);
 }
 
-bool AreaTrigger_at_blackrock_spire(Player* pPlayer, AreaTriggerEntry* pAt)
+bool AreaTrigger_at_blackrock_spire(Player* pPlayer, AreaTriggerEntry const* pAt)
 {
     if (pPlayer->isDead())
         return false;
diff --git a/scripts/eastern_kingdoms/sunken_temple/sunken_temple.cpp b/scripts/eastern_kingdoms/sunken_temple/sunken_temple.cpp
@@ -35,7 +35,7 @@ enum
     QUEST_ERANIKUS_TYRANT_OF_DREAMS   = 8733
 };
 
-bool AreaTrigger_at_shade_of_eranikus(Player* pPlayer, AreaTriggerEntry *pAt)
+bool AreaTrigger_at_shade_of_eranikus(Player* pPlayer, AreaTriggerEntry const* pAt)
 {
     if (ScriptedInstance* pInstance = (ScriptedInstance*)pPlayer->GetInstanceData())
     {
diff --git a/scripts/eastern_kingdoms/sunwell_plateau/boss_brutallus.cpp b/scripts/eastern_kingdoms/sunwell_plateau/boss_brutallus.cpp
@@ -192,7 +192,7 @@ CreatureAI* GetAI_boss_brutallus(Creature* pCreature)
     return new boss_brutallusAI(pCreature);
 }
 
-bool AreaTrigger_at_madrigosa(Player* pPlayer, AreaTriggerEntry* pAt)
+bool AreaTrigger_at_madrigosa(Player* pPlayer, AreaTriggerEntry const* pAt)
 {
     if (ScriptedInstance* pInstance = (ScriptedInstance*)pPlayer->GetInstanceData())
     {
diff --git a/scripts/examples/example_misc.cpp b/scripts/examples/example_misc.cpp
@@ -28,7 +28,7 @@ enum
     SAY_HI  = -1999925
 };
 
-bool AT_example_areatrigger(Player* pPlayer, AreaTriggerEntry *pAt)
+bool AT_example_areatrigger(Player* pPlayer, AreaTriggerEntry const* pAt)
 {
     DoScriptText(SAY_HI, pPlayer);
     return true;
diff --git a/scripts/kalimdor/the_barrens.cpp b/scripts/kalimdor/the_barrens.cpp
@@ -465,7 +465,7 @@ CreatureAI* GetAI_npc_twiggy_flathead(Creature* pCreature)
     return new npc_twiggy_flatheadAI(pCreature);
 }
 
-bool AreaTrigger_at_twiggy_flathead(Player* pPlayer, AreaTriggerEntry* pAt)
+bool AreaTrigger_at_twiggy_flathead(Player* pPlayer, AreaTriggerEntry const* pAt)
 {
     if (!pPlayer->isDead() && pPlayer->GetQuestStatus(QUEST_AFFRAY) == QUEST_STATUS_INCOMPLETE)
     {
diff --git a/scripts/northrend/naxxramas/instance_naxxramas.cpp b/scripts/northrend/naxxramas/instance_naxxramas.cpp
@@ -604,7 +604,7 @@ InstanceData* GetInstanceData_instance_naxxramas(Map* pMap)
     return new instance_naxxramas(pMap);
 }
 
-bool AreaTrigger_at_naxxramas(Player* pPlayer, AreaTriggerEntry* pAt)
+bool AreaTrigger_at_naxxramas(Player* pPlayer, AreaTriggerEntry const* pAt)
 {
     if (pAt->id == AREATRIGGER_KELTHUZAD)
     {
diff --git a/scripts/northrend/utgarde_keep/utgarde_pinnacle/boss_skadi.cpp b/scripts/northrend/utgarde_keep/utgarde_pinnacle/boss_skadi.cpp
@@ -121,7 +121,7 @@ CreatureAI* GetAI_boss_skadi(Creature* pCreature)
     return new boss_skadiAI(pCreature);
 }
 
-bool AreaTrigger_at_skadi(Player* pPlayer, AreaTriggerEntry* pAt)
+bool AreaTrigger_at_skadi(Player* pPlayer, AreaTriggerEntry const* pAt)
 {
     if (ScriptedInstance* pInstance = (ScriptedInstance*)pPlayer->GetInstanceData())
     {
diff --git a/scripts/northrend/utgarde_keep/utgarde_pinnacle/boss_svala.cpp b/scripts/northrend/utgarde_keep/utgarde_pinnacle/boss_svala.cpp
@@ -248,7 +248,7 @@ CreatureAI* GetAI_boss_svala(Creature* pCreature)
     return new boss_svalaAI(pCreature);
 }
 
-bool AreaTrigger_at_svala_intro(Player* pPlayer, AreaTriggerEntry* pAt)
+bool AreaTrigger_at_svala_intro(Player* pPlayer, AreaTriggerEntry const* pAt)
 {
     if (ScriptedInstance* pInstance = (ScriptedInstance*)pPlayer->GetInstanceData())
     {
diff --git a/scripts/outland/netherstorm.cpp b/scripts/outland/netherstorm.cpp
@@ -599,7 +599,7 @@ CreatureAI* GetAI_npc_commander_dawnforge(Creature* pCreature)
     return new npc_commander_dawnforgeAI(pCreature);
 }
 
-bool AreaTrigger_at_commander_dawnforge(Player* pPlayer, AreaTriggerEntry *at)
+bool AreaTrigger_at_commander_dawnforge(Player* pPlayer, AreaTriggerEntry const* pAt)
 {
     // if player lost aura or not have at all, we should not try start event.
     if (!pPlayer->HasAura(SPELL_SUNFURY_DISGUISE, EFFECT_INDEX_0))
diff --git a/scripts/world/areatrigger_scripts.cpp b/scripts/world/areatrigger_scripts.cpp
@@ -43,7 +43,7 @@ uint32 TriggerOrphanSpell[6][3] =
     {3552, 14305, 65054}    // Spooky Lighthouse
 };
 
-bool AreaTrigger_at_childrens_week_spot(Player* pPlayer, AreaTriggerEntry* pAt)
+bool AreaTrigger_at_childrens_week_spot(Player* pPlayer, AreaTriggerEntry const* pAt)
 {
     for (uint8 i = 0; i < 6; ++i)
     {
@@ -74,7 +74,7 @@ enum
     NPC_NORTHWEST_GATE          = 32199
 };
 
-bool AreaTrigger_at_aldurthar_gate(Player* pPlayer, AreaTriggerEntry* pAt)
+bool AreaTrigger_at_aldurthar_gate(Player* pPlayer, AreaTriggerEntry const* pAt)
 {
     switch(pAt->id)
     {
@@ -95,7 +95,7 @@ enum
     GO_COILFANG_WATERFALL   = 184212
 };
 
-bool AreaTrigger_at_coilfang_waterfall(Player* pPlayer, AreaTriggerEntry* pAt)
+bool AreaTrigger_at_coilfang_waterfall(Player* pPlayer, AreaTriggerEntry const* pAt)
 {
     if (GameObject* pGo = GetClosestGameObjectWithEntry(pPlayer, GO_COILFANG_WATERFALL, 35.0f))
     {
@@ -118,7 +118,7 @@ enum
     QUEST_GAINING_ACCESS_H  = 10604
 };
 
-bool AreaTrigger_at_legion_teleporter(Player* pPlayer, AreaTriggerEntry* pAt)
+bool AreaTrigger_at_legion_teleporter(Player* pPlayer, AreaTriggerEntry const* pAt)
 {
     if (pPlayer->isAlive() && !pPlayer->isInCombat())
     {
@@ -148,7 +148,7 @@ enum
     NPC_RAVENHOLDT          = 13936
 };
 
-bool AreaTrigger_at_ravenholdt(Player* pPlayer, AreaTriggerEntry* pAt)
+bool AreaTrigger_at_ravenholdt(Player* pPlayer, AreaTriggerEntry const* pAt)
 {
     if (pPlayer->GetQuestStatus(QUEST_MANOR_RAVENHOLDT) == QUEST_STATUS_INCOMPLETE)
         pPlayer->KilledMonsterCredit(NPC_RAVENHOLDT, 0);
@@ -172,7 +172,7 @@ enum
     AT_TORP_FARM                = 4872
 };
 
-bool AreaTrigger_at_warsong_farms(Player* pPlayer, AreaTriggerEntry* pAt)
+bool AreaTrigger_at_warsong_farms(Player* pPlayer, AreaTriggerEntry const* pAt)
 {
     if (!pPlayer->isDead() && pPlayer->GetQuestStatus(QUEST_THE_WARSONG_FARMS) == QUEST_STATUS_INCOMPLETE)
     {
@@ -196,7 +196,7 @@ enum
     SPELL_CREATE_TRUE_POWER_OF_THE_TEMPEST   = 53067
 };
 
-bool AreaTrigger_at_stormwright_shelf(Player* pPlayer, AreaTriggerEntry* pAt)
+bool AreaTrigger_at_stormwright_shelf(Player* pPlayer, AreaTriggerEntry const* pAt)
 {
     if (!pPlayer->isDead() && pPlayer->GetQuestStatus(QUEST_STRENGTH_OF_THE_TEMPEST) == QUEST_STATUS_INCOMPLETE)
         pPlayer->CastSpell(pPlayer, SPELL_CREATE_TRUE_POWER_OF_THE_TEMPEST, false);

Original file line number	Diff line number	Diff line change
`@@ -462,7 +462,7 @@ bool GOChooseReward(Player* pPlayer, GameObject* pGo, const Quest* pQuest, uint3`
`462`	`462`	`}`
`463`	`463`
`464`	`464`	`MANGOS_DLL_EXPORT`
`465`		`-bool AreaTrigger(Player* pPlayer, AreaTriggerEntry * atEntry)`
	`465`	`+bool AreaTrigger(Player* pPlayer, AreaTriggerEntry const* atEntry)`
`466`	`466`	`{`
`467`	`467`	`Script *tmpscript = m_scripts[GetAreaTriggerScriptId(atEntry->id)];`
`468`	`468`
Original file line number	Diff line number	Diff line change
`@@ -83,7 +83,7 @@ static uint32 RingBoss[]=`
`83`	`83`	`9032, // Hedrum`
`84`	`84`	`};`
`85`	`85`
`86`		`-bool AreaTrigger_at_ring_of_law(Player* pPlayer, AreaTriggerEntry* pAt)`
	`86`	`+bool AreaTrigger_at_ring_of_law(Player* pPlayer, AreaTriggerEntry const* pAt)`
`87`	`87`	`{`
`88`	`88`	`if (ScriptedInstance* pInstance = (ScriptedInstance*)pPlayer->GetInstanceData())`
`89`	`89`	`{`
Original file line number	Diff line number	Diff line change
`@@ -265,7 +265,7 @@ InstanceData* GetInstanceData_instance_blackrock_spire(Map* pMap)`
`265`	`265`	`return new instance_blackrock_spire(pMap);`
`266`	`266`	`}`
`267`	`267`
`268`		`-bool AreaTrigger_at_blackrock_spire(Player* pPlayer, AreaTriggerEntry* pAt)`
	`268`	`+bool AreaTrigger_at_blackrock_spire(Player* pPlayer, AreaTriggerEntry const* pAt)`
`269`	`269`	`{`
`270`	`270`	`if (pPlayer->isDead())`
`271`	`271`	`return false;`
Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ enum`
`35`	`35`	`QUEST_ERANIKUS_TYRANT_OF_DREAMS = 8733`
`36`	`36`	`};`
`37`	`37`
`38`		`-bool AreaTrigger_at_shade_of_eranikus(Player* pPlayer, AreaTriggerEntry *pAt)`
	`38`	`+bool AreaTrigger_at_shade_of_eranikus(Player* pPlayer, AreaTriggerEntry const* pAt)`
`39`	`39`	`{`
`40`	`40`	`if (ScriptedInstance* pInstance = (ScriptedInstance*)pPlayer->GetInstanceData())`
`41`	`41`	`{`
Original file line number	Diff line number	Diff line change
`@@ -192,7 +192,7 @@ CreatureAI* GetAI_boss_brutallus(Creature* pCreature)`
`192`	`192`	`return new boss_brutallusAI(pCreature);`
`193`	`193`	`}`
`194`	`194`
`195`		`-bool AreaTrigger_at_madrigosa(Player* pPlayer, AreaTriggerEntry* pAt)`
	`195`	`+bool AreaTrigger_at_madrigosa(Player* pPlayer, AreaTriggerEntry const* pAt)`
`196`	`196`	`{`
`197`	`197`	`if (ScriptedInstance* pInstance = (ScriptedInstance*)pPlayer->GetInstanceData())`
`198`	`198`	`{`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ enum`
`28`	`28`	`SAY_HI = -1999925`
`29`	`29`	`};`
`30`	`30`
`31`		`-bool AT_example_areatrigger(Player* pPlayer, AreaTriggerEntry *pAt)`
	`31`	`+bool AT_example_areatrigger(Player* pPlayer, AreaTriggerEntry const* pAt)`
`32`	`32`	`{`
`33`	`33`	`DoScriptText(SAY_HI, pPlayer);`
`34`	`34`	`return true;`
Original file line number	Diff line number	Diff line change
`@@ -465,7 +465,7 @@ CreatureAI* GetAI_npc_twiggy_flathead(Creature* pCreature)`
`465`	`465`	`return new npc_twiggy_flatheadAI(pCreature);`
`466`	`466`	`}`
`467`	`467`
`468`		`-bool AreaTrigger_at_twiggy_flathead(Player* pPlayer, AreaTriggerEntry* pAt)`
	`468`	`+bool AreaTrigger_at_twiggy_flathead(Player* pPlayer, AreaTriggerEntry const* pAt)`
`469`	`469`	`{`
`470`	`470`	`if (!pPlayer->isDead() && pPlayer->GetQuestStatus(QUEST_AFFRAY) == QUEST_STATUS_INCOMPLETE)`
`471`	`471`	`{`
Original file line number	Diff line number	Diff line change
`@@ -604,7 +604,7 @@ InstanceData* GetInstanceData_instance_naxxramas(Map* pMap)`
`604`	`604`	`return new instance_naxxramas(pMap);`
`605`	`605`	`}`
`606`	`606`
`607`		`-bool AreaTrigger_at_naxxramas(Player* pPlayer, AreaTriggerEntry* pAt)`
	`607`	`+bool AreaTrigger_at_naxxramas(Player* pPlayer, AreaTriggerEntry const* pAt)`
`608`	`608`	`{`
`609`	`609`	`if (pAt->id == AREATRIGGER_KELTHUZAD)`
`610`	`610`	`{`
Original file line number	Diff line number	Diff line change
`@@ -121,7 +121,7 @@ CreatureAI* GetAI_boss_skadi(Creature* pCreature)`
`121`	`121`	`return new boss_skadiAI(pCreature);`
`122`	`122`	`}`
`123`	`123`
`124`		`-bool AreaTrigger_at_skadi(Player* pPlayer, AreaTriggerEntry* pAt)`
	`124`	`+bool AreaTrigger_at_skadi(Player* pPlayer, AreaTriggerEntry const* pAt)`
`125`	`125`	`{`
`126`	`126`	`if (ScriptedInstance* pInstance = (ScriptedInstance*)pPlayer->GetInstanceData())`
`127`	`127`	`{`