Halls of Lighting, Sjonnir the Ironshaper: Fix blink exploiting & fix compile

--HG--
branch : trunk
This commit is contained in:
tartalo
2009-12-09 13:55:30 +01:00
parent 0e8cc1e5a4
commit 8a7ba0a20f
3 changed files with 9 additions and 2 deletions

View File

@@ -38,7 +38,7 @@ enum Yells
#define EMOTE_GENERIC_FRENZY -1000002
enum Creatures
enum SjonnirCreatures
{
CREATURE_FORGED_IRON_TROGG = 27979,
CREATURE_MALFORMED_OOZE = 27981,
@@ -113,7 +113,12 @@ struct TRINITY_DLL_DECL boss_sjonnirAI : public ScriptedAI
uiEncounterTimer = 0;
if (pInstance)
{
pInstance->SetData(DATA_SJONNIR_EVENT, IN_PROGRESS);
if (GameObject pDoor = pInstance->instance->GetGameObject(pInstance->GetData64(DATA_SJONNIR_DOOR)) &&
pDoor->GetGoState() == GO_STATE_READY)
EnterEvadeMode();
}
}
void UpdateAI(const uint32 diff)

View File

@@ -19,7 +19,8 @@ enum Data64
DATA_GO_KADDRAK,
DATA_GO_MARNAK,
DATA_GO_ABEDNEUM,
DATA_GO_SKY_FLOOR
DATA_GO_SKY_FLOOR,
DATA_SJONNIR_DOOR
};
enum Creatures
{

View File

@@ -186,6 +186,7 @@ struct TRINITY_DLL_DECL instance_halls_of_stone : public ScriptedInstance
case DATA_GO_ABEDNEUM: return uiAbedneumGo;
case DATA_GO_MARNAK: return uiMarnakGo;
case DATA_GO_SKY_FLOOR: return uiTribunalSkyFloor;
case DATA_SJONNIR_DOOR: return uiSjonnirDoor;
}
return 0;