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));
i_unloadActiveLockCount = 0;
i_unloadExplicitLock = false;
i_unloadReferenceLock = false;
}
public GridInfo(long expiry, bool unload = true)
@@ -39,7 +38,6 @@ namespace Game.Maps
vis_Update = new PeriodicTimer(0, RandomHelper.IRand(0, 1000));
i_unloadActiveLockCount = 0;
i_unloadExplicitLock = !unload;
i_unloadReferenceLock = false;
}
public TimeTracker getTimeTracker()
@@ -49,7 +47,7 @@ namespace Game.Maps
public bool getUnloadLock()
{
return i_unloadActiveLockCount != 0 || i_unloadExplicitLock || i_unloadReferenceLock;
return i_unloadActiveLockCount != 0 || i_unloadExplicitLock;
}
public void setUnloadExplicitLock(bool on)
@@ -57,11 +55,6 @@ namespace Game.Maps
i_unloadExplicitLock = on;
}
public void setUnloadReferenceLock(bool on)
{
i_unloadReferenceLock = on;
}
public void incUnloadActiveLock()
{
++i_unloadActiveLockCount;
@@ -97,7 +90,6 @@ namespace Game.Maps
ushort i_unloadActiveLockCount; // lock from active object spawn points (prevent clone loading)
bool i_unloadExplicitLock; // explicit manual lock or config setting
bool i_unloadReferenceLock; // lock from instance map copy
}
public class Grid
@@ -186,11 +178,6 @@ namespace Game.Maps
gridInfo.setUnloadExplicitLock(on);
}
public void setUnloadReferenceLock(bool on)
{
gridInfo.setUnloadReferenceLock(on);
}
public void incUnloadActiveLock()
{
gridInfo.incUnloadActiveLock();