Inna/CypherCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Core/Maps: Move terrain data handling out of Map class

Browse Source 
Port From (https://github.com/TrinityCore/TrinityCore/commit/16a06346aea16ffd6ee84081cedfdb0c75ac0b38)
This commit is contained in:
hondacrx
2022-07-24 16:31:00 -04:00
parent c4344fbf66
commit 3cd58e4a17
25 changed files with 1035 additions and 960 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Game/Maps/MapManager.cs
-65
View File
@@ -43,11 +43,6 @@ namespace Game.Entities
m_updater = new MapUpdater(WorldConfig.GetIntValue(WorldCfg.Numthreads));
}
public void InitializeParentMapData(MultiMap<uint, uint> mapData)
{
_parentMapData = mapData;
}
public void InitializeVisibilityDistanceInfo()
{
foreach (var pair in i_maps)
@@ -85,13 +80,8 @@ namespace Game.Entities
else
map = new Map(mapEntry.Id, i_gridCleanUpDelay, 0, Difficulty.None);
map.DiscoverGridMapFiles();
i_maps[mapEntry.Id] = map;
foreach (uint childMapId in _parentMapData[mapEntry.Id])
map.AddChildTerrainMap(CreateBaseMap_i(CliDB.MapStorage.LookupByKey(childMapId)));
if (!mapEntry.Instanceable())
{
map.LoadRespawnTimes();
@@ -240,16 +230,6 @@ namespace Game.Entities
i_timer.SetCurrent(0);
}
public bool ExistMapAndVMap(uint mapid, float x, float y)
{
GridCoord p = GridDefines.ComputeGridCoord(x, y);
uint gx = (MapConst.MaxGrids - 1) - p.X_coord;
uint gy = (MapConst.MaxGrids - 1) - p.Y_coord;
return Map.ExistMap(mapid, gx, gy) && Map.ExistVMap(mapid, gx, gy);
}
public bool IsValidMAP(uint mapId)
{
return CliDB.MapStorage.ContainsKey(mapId);
@@ -399,48 +379,6 @@ namespace Game.Entities
{
return i_maps.LookupByKey(mapId);
}
public uint GetAreaId(PhaseShift phaseShift, uint mapid, float x, float y, float z)
{
Map m = CreateBaseMap(mapid);
return m.GetAreaId(phaseShift, x, y, z);
}
public uint GetAreaId(PhaseShift phaseShift, uint mapid, Position pos)
{
return GetAreaId(phaseShift, mapid, pos.GetPositionX(), pos.GetPositionY(), pos.GetPositionZ());
}
public uint GetAreaId(PhaseShift phaseShift, WorldLocation loc)
{
return GetAreaId(phaseShift, loc.GetMapId(), loc);
}
public uint GetZoneId(PhaseShift phaseShift, uint mapid, Position pos) { return GetZoneId(phaseShift, mapid, pos.GetPositionX(), pos.GetPositionY(), pos.GetPositionZ()); }
public uint GetZoneId(PhaseShift phaseShift, WorldLocation loc) { return GetZoneId(phaseShift, loc.GetMapId(), loc); }
public uint GetZoneId(PhaseShift phaseShift, uint mapid, float x, float y, float z)
{
Map m = CreateBaseMap(mapid);
return m.GetZoneId(phaseShift, x, y, z);
}
public void GetZoneAndAreaId(PhaseShift phaseShift, out uint zoneid, out uint areaid, uint mapid, float x, float y, float z)
{
Map m = CreateBaseMap(mapid);
m.GetZoneAndAreaId(phaseShift, out zoneid, out areaid, x, y, z);
}
public void GetZoneAndAreaId(PhaseShift phaseShift, out uint zoneid, out uint areaid, uint mapid, Position pos)
{
GetZoneAndAreaId(phaseShift, out zoneid, out areaid, mapid, pos.GetPositionX(), pos.GetPositionY(), pos.GetPositionZ());
}
public void GetZoneAndAreaId(PhaseShift phaseShift, out uint zoneid, out uint areaid, WorldLocation loc)
{
GetZoneAndAreaId(phaseShift, out zoneid, out areaid, loc.GetMapId(), loc);
}
public void DoForAllMaps(Action<Map> worker)
{
@@ -494,8 +432,5 @@ namespace Game.Entities
uint _nextInstanceId;
MapUpdater m_updater;
uint _scheduledScripts;
// parent map links
MultiMap<uint, uint> _parentMapData;
}
}