diff options
| -rw-r--r-- | src/server/game/Battlefield/Zones/BattlefieldWG.cpp | 2 | ||||
| -rw-r--r-- | src/server/game/Battlefield/Zones/BattlefieldWG.h | 12 | ||||
| -rw-r--r-- | src/server/game/Entities/Player/Player.cpp | 2 | ||||
| -rw-r--r-- | src/server/game/Spells/SpellInfo.cpp | 2 | ||||
| -rw-r--r-- | src/server/scripts/Northrend/zone_wintergrasp.cpp | 2 | ||||
| -rw-r--r-- | src/server/shared/SharedDefines.h | 11 |
6 files changed, 15 insertions, 16 deletions
diff --git a/src/server/game/Battlefield/Zones/BattlefieldWG.cpp b/src/server/game/Battlefield/Zones/BattlefieldWG.cpp index f2449f34960..1415e2b8a8d 100644 --- a/src/server/game/Battlefield/Zones/BattlefieldWG.cpp +++ b/src/server/game/Battlefield/Zones/BattlefieldWG.cpp @@ -408,7 +408,7 @@ bool BattlefieldWG::SetupBattlefield() { m_TypeId = BATTLEFIELD_WG; // See enum BattlefieldTypes m_BattleId = BATTLEFIELD_BATTLEID_WG; - m_ZoneId = BATTLEFIELD_WG_ZONEID; + m_ZoneId = AREA_WINTERGRASP; m_MapId = BATTLEFIELD_WG_MAPID; m_Map = sMapMgr->FindMap(m_MapId, 0); diff --git a/src/server/game/Battlefield/Zones/BattlefieldWG.h b/src/server/game/Battlefield/Zones/BattlefieldWG.h index ca21b345412..395afd62b77 100644 --- a/src/server/game/Battlefield/Zones/BattlefieldWG.h +++ b/src/server/game/Battlefield/Zones/BattlefieldWG.h @@ -107,7 +107,6 @@ enum WintergraspData BATTLEFIELD_WG_DATA_DEF_H, BATTLEFIELD_WG_DATA_MAX, - BATTLEFIELD_WG_ZONEID = 4197, // Wintergrasp BATTLEFIELD_WG_MAPID = 571 // Northrend }; @@ -147,17 +146,6 @@ enum WintergraspWorldStates BATTLEFIELD_WG_WORLD_STATE_DEFENDED_A = 4025 }; -enum WintergraspAreaIds -{ - AREA_WINTERGRASP_FORTRESS = 4575, - AREA_THE_SUNKEN_RING = 4538, - AREA_THE_BROKEN_TEMPLATE = 4539, - AREA_WESTPARK_WORKSHOP = 4611, - AREA_EASTPARK_WORKSHOP = 4612, - AREA_WINTERGRASP = 4197, - AREA_THE_CHILLED_QUAGMIRE = 4589 -}; - enum WintergraspQuests { QUEST_VICTORY_WINTERGRASP_A = 13181, diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp index d32a410204e..04caef0d29a 100644 --- a/src/server/game/Entities/Player/Player.cpp +++ b/src/server/game/Entities/Player/Player.cpp @@ -9378,7 +9378,7 @@ void Player::SendInitWorldStates(uint32 zoneId, uint32 areaId) packet.Worldstates.emplace_back(4882, 0); // WORLD_STATE_HOR_WAVE_COUNT } break; - case 4197: // Wintergrasp + case AREA_WINTERGRASP: // Wintergrasp if (battlefield && battlefield->GetTypeId() == BATTLEFIELD_WG) battlefield->FillInitialWorldStates(packet); else diff --git a/src/server/game/Spells/SpellInfo.cpp b/src/server/game/Spells/SpellInfo.cpp index ec383cc24a3..71715e68329 100644 --- a/src/server/game/Spells/SpellInfo.cpp +++ b/src/server/game/Spells/SpellInfo.cpp @@ -1581,7 +1581,7 @@ SpellCastResult SpellInfo::CheckLocation(uint32 map_id, uint32 zone_id, uint32 a if (!mapEntry) return SPELL_FAILED_INCORRECT_AREA; - return zone_id == 4197 || (mapEntry->IsBattleground() && player && player->InBattleground()) ? SPELL_CAST_OK : SPELL_FAILED_REQUIRES_AREA; + return zone_id == AREA_WINTERGRASP || (mapEntry->IsBattleground() && player && player->InBattleground()) ? SPELL_CAST_OK : SPELL_FAILED_REQUIRES_AREA; } case 44521: // Preparation { diff --git a/src/server/scripts/Northrend/zone_wintergrasp.cpp b/src/server/scripts/Northrend/zone_wintergrasp.cpp index 2a00907c816..2ee290ff9b9 100644 --- a/src/server/scripts/Northrend/zone_wintergrasp.cpp +++ b/src/server/scripts/Northrend/zone_wintergrasp.cpp @@ -535,7 +535,7 @@ class spell_wintergrasp_defender_teleport : public SpellScriptLoader if (Battlefield* wg = sBattlefieldMgr->GetBattlefieldByBattleId(BATTLEFIELD_BATTLEID_WG)) if (Player* target = GetExplTargetUnit()->ToPlayer()) // check if we are in Wintergrasp at all, SotA uses same teleport spells - if ((target->GetZoneId() == 4197 && target->GetTeamId() != wg->GetDefenderTeam()) || target->HasAura(SPELL_WINTERGRASP_TELEPORT_TRIGGER)) + if ((target->GetZoneId() == AREA_WINTERGRASP && target->GetTeamId() != wg->GetDefenderTeam()) || target->HasAura(SPELL_WINTERGRASP_TELEPORT_TRIGGER)) return SPELL_FAILED_BAD_TARGETS; return SPELL_CAST_OK; } diff --git a/src/server/shared/SharedDefines.h b/src/server/shared/SharedDefines.h index d5ba8e3cdf9..4bea3a01410 100644 --- a/src/server/shared/SharedDefines.h +++ b/src/server/shared/SharedDefines.h @@ -3816,6 +3816,17 @@ enum class MountResult : uint32 Ok = 10 // never sent }; +enum AreaId : uint32 +{ + AREA_WINTERGRASP = 4197, + AREA_THE_SUNKEN_RING = 4538, + AREA_THE_BROKEN_TEMPLATE = 4539, + AREA_WINTERGRASP_FORTRESS = 4575, + AREA_THE_CHILLED_QUAGMIRE = 4589, + AREA_WESTPARK_WORKSHOP = 4611, + AREA_EASTPARK_WORKSHOP = 4612, +}; + namespace Trinity { namespace Impl |