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

Core/Maps: Fixed loading vmaps and mmaps in instances

Browse Source
This commit is contained in:
hondacrx
2018-05-06 15:28:27 -04:00
parent 91ab38cc13
commit 90e99102fd
3 changed files with 40 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Game/Maps/Grid.cs
+1 -14
View File
@@ -30,7 +30,6 @@ namespace Game.Maps
vis_Update = new PeriodicTimer(0, RandomHelper.IRand(0, 1000)); vis_Update = new PeriodicTimer(0, RandomHelper.IRand(0, 1000));
i_unloadActiveLockCount = 0; i_unloadActiveLockCount = 0;
i_unloadExplicitLock = false; i_unloadExplicitLock = false;
i_unloadReferenceLock = false;
} }
public GridInfo(long expiry, bool unload = true) public GridInfo(long expiry, bool unload = true)
@@ -39,7 +38,6 @@ namespace Game.Maps
vis_Update = new PeriodicTimer(0, RandomHelper.IRand(0, 1000)); vis_Update = new PeriodicTimer(0, RandomHelper.IRand(0, 1000));
i_unloadActiveLockCount = 0; i_unloadActiveLockCount = 0;
i_unloadExplicitLock = !unload; i_unloadExplicitLock = !unload;
i_unloadReferenceLock = false;
} }
public TimeTracker getTimeTracker() public TimeTracker getTimeTracker()
@@ -49,7 +47,7 @@ namespace Game.Maps
public bool getUnloadLock() public bool getUnloadLock()
{ {
return i_unloadActiveLockCount != 0 || i_unloadExplicitLock || i_unloadReferenceLock; return i_unloadActiveLockCount != 0 || i_unloadExplicitLock;
} }
public void setUnloadExplicitLock(bool on) public void setUnloadExplicitLock(bool on)
@@ -57,11 +55,6 @@ namespace Game.Maps
i_unloadExplicitLock = on; i_unloadExplicitLock = on;
} }
public void setUnloadReferenceLock(bool on)
{
i_unloadReferenceLock = on;
}
public void incUnloadActiveLock() public void incUnloadActiveLock()
{ {
++i_unloadActiveLockCount; ++i_unloadActiveLockCount;
@@ -97,7 +90,6 @@ namespace Game.Maps
ushort i_unloadActiveLockCount; // lock from active object spawn points (prevent clone loading) ushort i_unloadActiveLockCount; // lock from active object spawn points (prevent clone loading)
bool i_unloadExplicitLock; // explicit manual lock or config setting bool i_unloadExplicitLock; // explicit manual lock or config setting
bool i_unloadReferenceLock; // lock from instance map copy
} }
public class Grid public class Grid
@@ -186,11 +178,6 @@ namespace Game.Maps
gridInfo.setUnloadExplicitLock(on); gridInfo.setUnloadExplicitLock(on);
} }
public void setUnloadReferenceLock(bool on)
{
gridInfo.setUnloadReferenceLock(on);
}
public void incUnloadActiveLock() public void incUnloadActiveLock()
{ {
gridInfo.incUnloadActiveLock(); gridInfo.incUnloadActiveLock();
Source/Game/Maps/Instances/MapInstance.cs
+1 -19
View File
@@ -30,11 +30,7 @@ namespace Game.Maps
{ {
public class MapInstanced : Map public class MapInstanced : Map
{ {
public MapInstanced(uint id, uint expiry) : base(id, expiry, 0, Difficulty.Normal) public MapInstanced(uint id, uint expiry) : base(id, expiry, 0, Difficulty.Normal) { }
{
for (uint x = 0; x < MapConst.MaxGrids; ++x)
GridMapReference[x] = new uint[MapConst.MaxGrids];
}
public override void InitVisibilityDistance() public override void InitVisibilityDistance()
{ {
@@ -281,23 +277,9 @@ namespace Game.Maps
return m_InstancedMaps.LookupByKey(instanceId); return m_InstancedMaps.LookupByKey(instanceId);
} }
public void AddGridMapReference(GridCoord p)
{
++GridMapReference[p.x_coord][p.y_coord];
SetUnloadReferenceLock(new GridCoord(63 - p.x_coord, 63 - p.y_coord), true);
}
public void RemoveGridMapReference(GridCoord p)
{
--GridMapReference[p.x_coord][p.y_coord];
if (GridMapReference[p.x_coord][p.y_coord] == 0)
SetUnloadReferenceLock(new GridCoord(63 - p.x_coord, 63 - p.y_coord), false);
}
public Dictionary<uint, Map> GetInstancedMaps() { return m_InstancedMaps; } public Dictionary<uint, Map> GetInstancedMaps() { return m_InstancedMaps; }
Dictionary<uint, Map> m_InstancedMaps = new Dictionary<uint, Map>(); Dictionary<uint, Map> m_InstancedMaps = new Dictionary<uint, Map>();
uint[][] GridMapReference = new uint[MapConst.MaxGrids][];
} }
public class InstanceTemplate public class InstanceTemplate
Source/Game/Maps/Map.cs
+38 -63
View File
@@ -65,6 +65,7 @@ namespace Game.Maps
{ {
i_grids[x] = new Grid[MapConst.MaxGrids]; i_grids[x] = new Grid[MapConst.MaxGrids];
GridMaps[x] = new GridMap[MapConst.MaxGrids]; GridMaps[x] = new GridMap[MapConst.MaxGrids];
GridMapReference[x] = new ushort[MapConst.MaxGrids];
for (uint y = 0; y < MapConst.MaxGrids; ++y) for (uint y = 0; y < MapConst.MaxGrids; ++y)
{ {
//z code //z code
@@ -155,40 +156,32 @@ namespace Game.Maps
} }
} }
void LoadMap(uint gx, uint gy, bool reload = false) void LoadMap(uint gx, uint gy)
{ {
LoadMapImpl(this, gx, gy, reload); LoadMapImpl(this, gx, gy);
foreach (Map childBaseMap in m_childTerrainMaps) foreach (Map childBaseMap in m_childTerrainMaps)
childBaseMap.LoadMap(gx, gy, reload); childBaseMap.LoadMap(gx, gy);
} }
void LoadMapImpl(Map map, uint gx, uint gy, bool reload) void LoadMapImpl(Map map, uint gx, uint gy)
{ {
if (map.i_InstanceId != 0)
{
if (map.GridMaps[gx][gy] != null)
return;
// load grid map for base map
GridCoord ngridCoord = new GridCoord((MapConst.MaxGrids - 1) - gx, (MapConst.MaxGrids - 1) - gy);
if (map.m_parentMap.getGrid(ngridCoord.x_coord, ngridCoord.y_coord) == null)
map.m_parentMap.EnsureGridCreated(ngridCoord);
((MapInstanced)map.m_parentMap).AddGridMapReference(new GridCoord(gx, gy));
map.GridMaps[gx][gy] = map.m_parentMap.GridMaps[gx][gy];
return;
}
if (map.GridMaps[gx][gy] != null && !reload)
return;
if (map.GridMaps[gx][gy] != null) if (map.GridMaps[gx][gy] != null)
{ return;
Log.outInfo(LogFilter.Maps, "Unloading previously loaded map {0} before reloading.", map.GetId());
Global.ScriptMgr.OnUnloadGridMap(map, map.GridMaps[gx][gy], gx, gy);
map.GridMaps[gx][gy] = null; Map parent = map.m_parentMap;
++parent.GridMapReference[gx][gy];
// load grid map for base map
if (parent != map)
{
GridCoord ngridCoord = new GridCoord((MapConst.MaxGrids - 1) - gx, (MapConst.MaxGrids - 1) - gy);
if (parent.GridMaps[gx][gy] == null)
parent.EnsureGridCreated(ngridCoord);
map.GridMaps[gx][gy] = parent.GridMaps[gx][gy];
return;
} }
// map file name // map file name
string filename = string.Format("{0}/maps/{1:D4}_{2:D2}_{3:D2}.map", Global.WorldMgr.GetDataPath(), map.GetId(), gx, gy); string filename = string.Format("{0}/maps/{1:D4}_{2:D2}_{3:D2}.map", Global.WorldMgr.GetDataPath(), map.GetId(), gx, gy);
Log.outInfo(LogFilter.Maps, "Loading map {0}", filename); Log.outInfo(LogFilter.Maps, "Loading map {0}", filename);
@@ -210,29 +203,25 @@ namespace Game.Maps
void UnloadMapImpl(Map map, uint gx, uint gy) void UnloadMapImpl(Map map, uint gx, uint gy)
{ {
if (map.i_InstanceId == 0) if (map.GridMaps[gx][gy] != null)
{ {
if (map.GridMaps[gx][gy] != null) Map parent = map.m_parentMap;
if ((--parent.GridMapReference[gx][gy]) == 0)
{ {
map.GridMaps[gx][gy].unloadData(); parent.GridMaps[gx][gy].unloadData();
map.GridMaps[gx][gy] = null; parent.GridMaps[gx][gy] = null;
} }
} }
else
map.m_parentMap.ToMapInstanced().RemoveGridMapReference(new GridCoord(gx, gy));
map.GridMaps[gx][gy] = null; map.GridMaps[gx][gy] = null;
} }
void LoadMapAndVMap(uint gx, uint gy) void LoadMapAndVMap(uint gx, uint gy)
{ {
m_parentTerrainMap.LoadMap(gx, gy); LoadMap(gx, gy);
// Only load the data for the base map LoadVMap(gx, gy);
if (i_InstanceId == 0) LoadMMap(gx, gy);
{
LoadVMap(gx, gy);
LoadMMap(gx, gy);
}
} }
public void LoadAllCells() public void LoadAllCells()
@@ -379,17 +368,16 @@ namespace Game.Maps
Log.outDebug(LogFilter.Maps, "Creating grid[{0}, {1}] for map {2} instance {3}", p.x_coord, p.y_coord, Log.outDebug(LogFilter.Maps, "Creating grid[{0}, {1}] for map {2} instance {3}", p.x_coord, p.y_coord,
GetId(), i_InstanceId); GetId(), i_InstanceId);
setGrid(new Grid(p.x_coord * MapConst.MaxGrids + p.y_coord, p.x_coord, p.y_coord, i_gridExpiry, WorldConfig.GetBoolValue(WorldCfg.GridUnload)), var grid = new Grid(p.x_coord * MapConst.MaxGrids + p.y_coord, p.x_coord, p.y_coord, i_gridExpiry, WorldConfig.GetBoolValue(WorldCfg.GridUnload));
p.x_coord, p.y_coord); grid.SetGridState(GridState.Idle);
setGrid(grid, p.x_coord, p.y_coord);
getGrid(p.x_coord, p.y_coord).SetGridState(GridState.Idle);
//z coord //z coord
uint gx = (MapConst.MaxGrids - 1) - p.x_coord; uint gx = (MapConst.MaxGrids - 1) - p.x_coord;
uint gy = (MapConst.MaxGrids - 1) - p.y_coord; uint gy = (MapConst.MaxGrids - 1) - p.y_coord;
if (GridMaps[gx][gy] == null) if (GridMaps[gx][gy] == null)
LoadMapAndVMap(gx, gy); m_parentTerrainMap.LoadMapAndVMap(gx, gy);
} }
} }
@@ -1597,17 +1585,13 @@ namespace Game.Maps
uint gy = (MapConst.MaxGrids - 1) - y; uint gy = (MapConst.MaxGrids - 1) - y;
// delete grid map, but don't delete if it is from parent map (and thus only reference) // delete grid map, but don't delete if it is from parent map (and thus only reference)
//+++if (GridMaps[gx][gy]) don't check for GridMaps[gx][gy], we might have to unload vmaps if (GridMaps[gx][gy] != null)
{ {
if (m_parentTerrainMap == this) m_parentTerrainMap.UnloadMap(gx, gy);
m_parentTerrainMap.UnloadMap(gx, gy); Global.VMapMgr.unloadMap(m_parentTerrainMap.GetId(), gx, gy);
Global.MMapMgr.unloadMap(m_parentTerrainMap.GetId(), gx, gy);
if (i_InstanceId == 0)
{
Global.VMapMgr.unloadMap(GetId(), gx, gy);
Global.MMapMgr.unloadMap(GetId(), gx, gy);
}
} }
Log.outDebug(LogFilter.Maps, "Unloading grid[{0}, {1}] for map {2} finished", x, y, GetId()); Log.outDebug(LogFilter.Maps, "Unloading grid[{0}, {1}] for map {2} finished", x, y, GetId());
return true; return true;
} }
@@ -2982,11 +2966,6 @@ namespace Game.Maps
return i_gridExpiry; return i_gridExpiry;
} }
private Map GetParent()
{
return m_parentMap;
}
public void AddChildTerrainMap(Map map) public void AddChildTerrainMap(Map map)
{ {
m_childTerrainMaps.Add(map); m_childTerrainMaps.Add(map);
@@ -3216,11 +3195,6 @@ namespace Game.Maps
getGrid(x, y).setGridObjectDataLoaded(pLoaded); getGrid(x, y).setGridObjectDataLoaded(pLoaded);
} }
public void SetUnloadReferenceLock(GridCoord p, bool on)
{
getGrid(p.x_coord, p.y_coord).setUnloadReferenceLock(on);
}
public AreaTrigger GetAreaTrigger(ObjectGuid guid) public AreaTrigger GetAreaTrigger(ObjectGuid guid)
{ {
if (!guid.IsAreaTrigger()) if (!guid.IsAreaTrigger())
@@ -4357,6 +4331,7 @@ namespace Game.Maps
List<AreaTrigger> _areaTriggersToMove = new List<AreaTrigger>(); List<AreaTrigger> _areaTriggersToMove = new List<AreaTrigger>();
GridMap[][] GridMaps = new GridMap[MapConst.MaxGrids][]; GridMap[][] GridMaps = new GridMap[MapConst.MaxGrids][];
ushort[][] GridMapReference = new ushort[MapConst.MaxGrids][];
Dictionary<ulong, long> _creatureRespawnTimes = new Dictionary<ulong, long>(); Dictionary<ulong, long> _creatureRespawnTimes = new Dictionary<ulong, long>();
DynamicMapTree _dynamicTree = new DynamicMapTree(); DynamicMapTree _dynamicTree = new DynamicMapTree();