josh/TCPlayerbotCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Halls of Stone: Remove magic numbers

Browse Source 
--HG--
branch : trunk
This commit is contained in:
tartalo
2009-12-09 13:50:23 +01:00
parent 18f3bdc393
commit 0e8cc1e5a4
2 changed files with 36 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/bindings/scripts/scripts/northrend/ulduar/halls_of_stone/halls_of_stone.h
+22
View File
@@ -21,4 +21,26 @@ enum Data64
DATA_GO_ABEDNEUM, DATA_GO_ABEDNEUM,
DATA_GO_SKY_FLOOR DATA_GO_SKY_FLOOR
}; };
enum Creatures
{
CREATURE_MAIDEN = 27975,
CREATURE_KRYSTALLUS = 27977,
CREATURE_SJONNIR = 27978,
CREATURE_MARNAK = 30897,
CREATURE_KADDRAK = 30898,
CREATURE_ABEDNEUM = 30899,
CREATURE_BRANN = 28070
};
enum GameObjects
{
GO_ABEDNEUM = 191669,
GO_MARNAK = 192170,
GO_KADDRAK = 192171,
GO_MAIDEN_DOOR = 191292,
GO_BRANN_DOOR = 191295,
GO_SJONNIR_DOOR = 191296,
GO_TRIBUNAL_CONSOLE = 193907,
GO_TRIBUNAL_CHEST = 190586,
GO_TRIBUNAL_CHEST_HERO = 193996
};
#endif #endif
src/bindings/scripts/scripts/northrend/ulduar/halls_of_stone/instance_halls_of_stone.cpp
+14 -20
View File
@@ -10,12 +10,6 @@
3- Sjonnir The Ironshaper 3- Sjonnir The Ironshaper
*/ */
enum GameObjects
{
GO_TRIBUNAL_CHEST = 190586,
GO_TRIBUNAL_CHEST_HERO = 193996
};
struct TRINITY_DLL_DECL instance_halls_of_stone : public ScriptedInstance struct TRINITY_DLL_DECL instance_halls_of_stone : public ScriptedInstance
{ {
instance_halls_of_stone(Map* pMap) : ScriptedInstance(pMap) {Initialize();}; instance_halls_of_stone(Map* pMap) : ScriptedInstance(pMap) {Initialize();};
@@ -72,13 +66,13 @@ struct TRINITY_DLL_DECL instance_halls_of_stone : public ScriptedInstance
{ {
switch(pCreature->GetEntry()) switch(pCreature->GetEntry())
{ {
case 27975: uiMaidenOfGrief = pCreature->GetGUID(); break; case CREATURE_MAIDEN: uiMaidenOfGrief = pCreature->GetGUID(); break;
case 27977: uiKrystallus = pCreature->GetGUID(); break; case CREATURE_KRYSTALLUS: uiKrystallus = pCreature->GetGUID(); break;
case 27978: uiSjonnir = pCreature->GetGUID(); break; case CREATURE_SJONNIR: uiSjonnir = pCreature->GetGUID(); break;
case 30897: uiMarnak = pCreature->GetGUID(); break; case CREATURE_MARNAK: uiMarnak = pCreature->GetGUID(); break;
case 30898: uiKaddrak = pCreature->GetGUID(); break; case CREATURE_KADDRAK: uiKaddrak = pCreature->GetGUID(); break;
case 30899: uiAbedneum = pCreature->GetGUID(); break; case CREATURE_ABEDNEUM: uiAbedneum = pCreature->GetGUID(); break;
case 28070: uiBrann = pCreature->GetGUID(); break; case CREATURE_BRANN: uiBrann = pCreature->GetGUID(); break;
} }
} }
@@ -86,37 +80,37 @@ struct TRINITY_DLL_DECL instance_halls_of_stone : public ScriptedInstance
{ {
switch(pGo->GetEntry()) switch(pGo->GetEntry())
{ {
case 191669: case GO_ABEDNEUM:
uiAbedneumGo = pGo->GetGUID(); uiAbedneumGo = pGo->GetGUID();
break; break;
case 192170: case GO_MARNAK:
uiMarnakGo = pGo->GetGUID(); uiMarnakGo = pGo->GetGUID();
break; break;
case 192171: case GO_KADDRAK:
uiKaddrakGo = pGo->GetGUID(); uiKaddrakGo = pGo->GetGUID();
break; break;
case 191292: case GO_MAIDEN_DOOR:
uiMaidenOfGriefDoor = pGo->GetGUID(); uiMaidenOfGriefDoor = pGo->GetGUID();
if (m_auiEncounter[0] == DONE) if (m_auiEncounter[0] == DONE)
pGo->SetGoState(GO_STATE_ACTIVE); pGo->SetGoState(GO_STATE_ACTIVE);
else else
pGo->SetGoState(GO_STATE_READY); pGo->SetGoState(GO_STATE_READY);
break; break;
case 191295: case GO_BRANN_DOOR:
uiBrannDoor = pGo->GetGUID(); uiBrannDoor = pGo->GetGUID();
if (m_auiEncounter[1] == DONE) if (m_auiEncounter[1] == DONE)
pGo->SetGoState(GO_STATE_ACTIVE); pGo->SetGoState(GO_STATE_ACTIVE);
else else
pGo->SetGoState(GO_STATE_READY); pGo->SetGoState(GO_STATE_READY);
break; break;
case 191296: case GO_SJONNIR_DOOR:
uiSjonnirDoor = pGo->GetGUID(); uiSjonnirDoor = pGo->GetGUID();
if (m_auiEncounter[2] == DONE) if (m_auiEncounter[2] == DONE)
pGo->SetGoState(GO_STATE_ACTIVE); pGo->SetGoState(GO_STATE_ACTIVE);
else else
pGo->SetGoState(GO_STATE_READY); pGo->SetGoState(GO_STATE_READY);
break; break;
case 193907: case GO_TRIBUNAL_CONSOLE:
uiTribunalConsole = pGo->GetGUID(); uiTribunalConsole = pGo->GetGUID();
break; break;
case GO_TRIBUNAL_CHEST: case GO_TRIBUNAL_CHEST: