diff --git a/src/server/scripts/EasternKingdoms/Deadmines/deadmines.cpp b/src/server/scripts/EasternKingdoms/Deadmines/deadmines.cpp index 9359a9f725..33399f0f0d 100644 --- a/src/server/scripts/EasternKingdoms/Deadmines/deadmines.cpp +++ b/src/server/scripts/EasternKingdoms/Deadmines/deadmines.cpp @@ -256,7 +256,7 @@ class npc_deadmines_steam_valve : public CreatureScript } }; -enum VanessaVanCleef +enum VanessaVanCleefGauntlet { SAY_GLUBTOK_INTRO_1 = 0, SAY_GLUBTOK_INTRO_2 = 1, diff --git a/src/server/scripts/EasternKingdoms/Uldaman/uldaman.cpp b/src/server/scripts/EasternKingdoms/Uldaman/uldaman.cpp index c21abbb6ee..076ea66aa7 100644 --- a/src/server/scripts/EasternKingdoms/Uldaman/uldaman.cpp +++ b/src/server/scripts/EasternKingdoms/Uldaman/uldaman.cpp @@ -42,7 +42,7 @@ namespace Uldaman ## npc_jadespine_basilisk ######*/ -enum Spells +enum USpells { SPELL_CRYSTALLINE_SLUMBER = 3636, }; diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/EndTime/instance_end_time.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/EndTime/instance_end_time.cpp index 49b4a28f6e..9a96b30cc0 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/EndTime/instance_end_time.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/EndTime/instance_end_time.cpp @@ -44,34 +44,34 @@ DoorData const doorData[] = { 0, 0, DOOR_TYPE_ROOM } // END }; -enum Events +enum ETEvents { EVENT_RESPAWN_MUROZOND = 1 }; -enum SpawnGroups +enum ETSpawnGroups { SPAWN_GROUP_ID_MUROZOND_CHEST = 437, SPAWN_GROUP_ID_ECHO_OF_JAINA = 460 }; -enum AreaIds +enum ETAreaIds { AREA_ID_BRONZE_DRAGON_SHRINE = 5795 }; -enum WorldStates +enum ETWorldStates { WORLD_STATE_ID_SHOW_COLLECTED_STAVE_FRAGMENTS = 6046, WORLD_STATE_ID_COLLECTED_STAVE_FRAGMENTS = 6025 }; -enum MapEvents +enum ETMapEvents { MAP_EVENT_AZURE_DRAGONSHRINE_ENTERED = 29225 }; -enum Spells +enum ETSpells { SPELL_SUMMON_PHANTOM = 102200 }; diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/instance_old_hillsbrad.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/instance_old_hillsbrad.cpp index 3313753e19..7dc8f9496e 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/instance_old_hillsbrad.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/instance_old_hillsbrad.cpp @@ -40,7 +40,6 @@ namespace EscapeFromDurnholdeKeep #define DRAKE_ENTRY 17848 -#define QUEST_ENTRY_DIVERSION 10283 #define LODGE_QUEST_TRIGGER 20155 class instance_old_hillsbrad : public InstanceMapScript diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.cpp index 90fd1f3b59..c911471c12 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.cpp @@ -39,6 +39,13 @@ EndContentData */ namespace EscapeFromDurnholdeKeep { +#define GOSSIP_HELLO_EROZION1 "I need a pack of Incendiary Bombs." +#define GOSSIP_HELLO_EROZION2 "[PH] Teleport please, i'm tired." + +/*###### +## npc_erozion +######*/ + enum Erozion { QUEST_ENTRY_HILLSBRAD = 10282, @@ -47,12 +54,6 @@ enum Erozion QUEST_ENTRY_RETURN = 10285, ITEM_ENTRY_BOMBS = 25853 }; -#define GOSSIP_HELLO_EROZION1 "I need a pack of Incendiary Bombs." -#define GOSSIP_HELLO_EROZION2 "[PH] Teleport please, i'm tired." - -/*###### -## npc_erozion -######*/ class npc_erozion : public CreatureScript { diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/the_black_morass.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/the_black_morass.cpp index aefb93daeb..c8f00c7dbc 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/the_black_morass.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/the_black_morass.cpp @@ -235,12 +235,12 @@ public: } }; -struct Wave +struct PortalWave { uint32 PortalMob[4]; //spawns for portal waves (in order) }; -static Wave PortalWaves[]= +static PortalWave PortalWaves[]= { { {NPC_INFINITE_ASSASIN, NPC_INFINITE_WHELP, NPC_INFINITE_CRONOMANCER, 0} }, { {NPC_INFINITE_EXECUTIONER, NPC_INFINITE_CRONOMANCER, NPC_INFINITE_WHELP, NPC_INFINITE_ASSASIN} }, diff --git a/src/server/scripts/Kalimdor/ThroneOfTheFourWinds/throne_of_the_four_winds.cpp b/src/server/scripts/Kalimdor/ThroneOfTheFourWinds/throne_of_the_four_winds.cpp index 84db9d0d64..e46980a2e9 100644 --- a/src/server/scripts/Kalimdor/ThroneOfTheFourWinds/throne_of_the_four_winds.cpp +++ b/src/server/scripts/Kalimdor/ThroneOfTheFourWinds/throne_of_the_four_winds.cpp @@ -31,7 +31,7 @@ namespace ThroneOfTheFourWinds { -enum Spells +enum ToTFWSpells { SPELL_JET_STREAM = 84576, SPELL_JET_STREAM_TRIGGERED = 84610, @@ -43,19 +43,19 @@ enum Spells SPELL_SLIPSTREAM_SAFE_FALL = 87740, }; -enum Events +enum ToTFWEvents { EVENT_EJECT_ALL_PASSENGERS = 1, EVENT_THROW_PASSENGER = 2 }; -enum Actions +enum ToTFWActions { // action id 1 is used by boss_conclave_of_wind ACTION_PLAYER_LEFT_PLATFORM = 2, }; -enum VehicleSeats +enum ToTFWVehicleSeats { SEAT_0 = 0 }; diff --git a/src/server/scripts/Kalimdor/VortexPinnacle/vortex_pinnacle.cpp b/src/server/scripts/Kalimdor/VortexPinnacle/vortex_pinnacle.cpp index 4ced771c27..baca4d8b43 100644 --- a/src/server/scripts/Kalimdor/VortexPinnacle/vortex_pinnacle.cpp +++ b/src/server/scripts/Kalimdor/VortexPinnacle/vortex_pinnacle.cpp @@ -32,12 +32,12 @@ namespace VortexPinnacle { -enum Texts +enum VPTrashTexts { SAY_FEIGN_DEATH = 0 }; -enum Spells +enum VPTrashSpells { // Lurking Tempest SPELL_LIGHTNING_BOLT = 89105, @@ -74,7 +74,7 @@ enum Spells SPELL_ARCANE_BARRAGE = 87845 }; -enum Events +enum VPTrashEvents { EVENT_NONE, @@ -94,7 +94,7 @@ enum Events EVENT_EJECT_ALL_PASSENGERS }; -enum Points +enum VPTrashPoints { POINT_NONE, POINT_RANDOM diff --git a/src/server/scripts/Maelstrom/Stonecore/stonecore.cpp b/src/server/scripts/Maelstrom/Stonecore/stonecore.cpp index 36ca444718..437b1e2a16 100644 --- a/src/server/scripts/Maelstrom/Stonecore/stonecore.cpp +++ b/src/server/scripts/Maelstrom/Stonecore/stonecore.cpp @@ -28,14 +28,14 @@ namespace Stonecore { -enum Texts +enum MillhouseTexts { // Millhouse Manastorm SAY_MILLHOUSE_EVENT_1 = 0, SAY_MILLHOUSE_EVENT_2 = 1 }; -enum Spells +enum MillhouseSpells { // Millhouse Manastorm SPELL_SHADOW_BOLT = 81439, @@ -53,7 +53,7 @@ enum Spells // SPELL_PORTAL_VISUAL = 79754, }; -enum Events +enum MillhouseEvents { // Millhouse Manastorm EVENT_FROSTBOLT_VOLLEY = 1, @@ -65,7 +65,7 @@ enum Events EVENT_RUN_AWAY }; -enum MovementPoints +enum MillhouseCMovementPoints { POINT_NONE,