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/Miscellaneous/SharedDefines.h | 11 | ||||
| -rw-r--r-- | src/server/game/Spells/SpellInfo.cpp | 2 |
5 files changed, 14 insertions, 15 deletions
diff --git a/src/server/game/Battlefield/Zones/BattlefieldWG.cpp b/src/server/game/Battlefield/Zones/BattlefieldWG.cpp index 138e7d03091..964e69f22d2 100644 --- a/src/server/game/Battlefield/Zones/BattlefieldWG.cpp +++ b/src/server/game/Battlefield/Zones/BattlefieldWG.cpp @@ -407,7 +407,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->CreateBaseMap(m_MapId); diff --git a/src/server/game/Battlefield/Zones/BattlefieldWG.h b/src/server/game/Battlefield/Zones/BattlefieldWG.h index 874ba1b7617..d3df5a6b21d 100644 --- a/src/server/game/Battlefield/Zones/BattlefieldWG.h +++ b/src/server/game/Battlefield/Zones/BattlefieldWG.h @@ -99,7 +99,6 @@ enum WintergraspData BATTLEFIELD_WG_DATA_DEF_H, BATTLEFIELD_WG_DATA_MAX, - BATTLEFIELD_WG_ZONEID = 4197, // Wintergrasp BATTLEFIELD_WG_MAPID = 571 // Northrend }; @@ -139,17 +138,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 913b137180d..5f0b56ac406 100644 --- a/src/server/game/Entities/Player/Player.cpp +++ b/src/server/game/Entities/Player/Player.cpp @@ -9712,7 +9712,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); break; diff --git a/src/server/game/Miscellaneous/SharedDefines.h b/src/server/game/Miscellaneous/SharedDefines.h index afa4a132faf..56d5aecfb97 100644 --- a/src/server/game/Miscellaneous/SharedDefines.h +++ b/src/server/game/Miscellaneous/SharedDefines.h @@ -7685,4 +7685,15 @@ 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, +}; + #endif diff --git a/src/server/game/Spells/SpellInfo.cpp b/src/server/game/Spells/SpellInfo.cpp index 7ac1e900388..706859ad8a0 100644 --- a/src/server/game/Spells/SpellInfo.cpp +++ b/src/server/game/Spells/SpellInfo.cpp @@ -2009,7 +2009,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 { |