nchebrov/azerothcore-wotlk
1
0
Fork 0
mirror of https://github.com/mod-playerbots/azerothcore-wotlk.git synced 2026-01-15 10:00:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into Playerbot

Browse Source
This commit is contained in:
Yunfan Li
2025-05-09 22:07:43 +08:00
parent ce9343d916 52799d76f6
commit 58fd50651d
210 changed files with 1309 additions and 977 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/server/game/Maps/Map.cpp
View File

@@ -102,10 +102,10 @@ void Map::InitVisibilityDistance()
switch (GetId())
{
case 609: // Scarlet Enclave (DK starting zone)
case MAP_EBON_HOLD: // Scarlet Enclave (DK starting zone)
m_VisibleDistance = 125.0f;
break;
case 25: // Scott Test (box map)
case MAP_SCOTT_TEST: // (box map)
m_VisibleDistance = 200.0f;
break;
}
@@ -1370,7 +1370,7 @@ LiquidData const Map::GetLiquidData(uint32 phaseMask, float x, float y, float z,
if (liquid_level > ground_level && G3D::fuzzyGe(z, ground_level - GROUND_HEIGHT_TOLERANCE))
{
// hardcoded in client like this
if (GetId() == 530 && liquid_type == 2)
if (GetId() == MAP_OUTLAND && liquid_type == 2)
liquid_type = 15;
uint32 liquidFlagType = 0;
@@ -1426,7 +1426,7 @@ LiquidData const Map::GetLiquidData(uint32 phaseMask, float x, float y, float z,
{
// hardcoded in client like this
uint32 liquidEntry = map_data.Entry;
if (GetId() == 530 && liquidEntry == 2)
if (GetId() == MAP_OUTLAND && liquidEntry == 2)
liquidEntry = 15;
liquidData = map_data;
@@ -1523,7 +1523,7 @@ void Map::GetFullTerrainStatusForPosition(uint32 /*phaseMask*/, float x, float y
if (wmoData && wmoData->liquidInfo && wmoData->liquidInfo->level > wmoData->floorZ)
{
uint32 liquidType = wmoData->liquidInfo->type;
if (GetId() == 530 && liquidType == 2) // gotta love blizzard hacks
if (GetId() == MAP_OUTLAND && liquidType == 2) // gotta love blizzard hacks
liquidType = 15;
uint32 liquidFlagType = 0;
@@ -1572,7 +1572,7 @@ void Map::GetFullTerrainStatusForPosition(uint32 /*phaseMask*/, float x, float y
if (gridLiquidData.Status != LIQUID_MAP_NO_WATER && (!wmoData || gridLiquidData.Level > wmoData->floorZ))
{
uint32 liquidEntry = gridLiquidData.Entry;
if (GetId() == 530 && liquidEntry == 2)
if (GetId() == MAP_OUTLAND && liquidEntry == 2)
liquidEntry = 15;
data.liquidInfo = gridLiquidData;