BFA Update (still lots of testing to do tho)

This commit is contained in:
hondacrx
2018-12-10 12:46:25 -05:00
parent 468b053946
commit 8e20114e10
256 changed files with 35613 additions and 10459 deletions
@@ -29,6 +29,13 @@ namespace Game.Collision
Ignored
}
public enum LoadResult
{
Success,
FileNotFound,
VersionMismatch
}
public class VMapManager : Singleton<VMapManager>
{
VMapManager() { }
@@ -124,7 +131,7 @@ namespace Game.Collision
}
}
public bool isInLineOfSight(uint mapId, float x1, float y1, float z1, float x2, float y2, float z2)
public bool isInLineOfSight(uint mapId, float x1, float y1, float z1, float x2, float y2, float z2, ModelIgnoreFlags ignoreFlags)
{
if (!isLineOfSightCalcEnabled() || Global.DisableMgr.IsDisabledFor(DisableType.VMAP, mapId, null, DisableFlags.VmapLOS))
return true;
@@ -135,7 +142,7 @@ namespace Game.Collision
Vector3 pos1 = convertPositionToInternalRep(x1, y1, z1);
Vector3 pos2 = convertPositionToInternalRep(x2, y2, z2);
if (pos1 != pos2)
return instanceTree.isInLineOfSight(pos1, pos2);
return instanceTree.isInLineOfSight(pos1, pos2, ignoreFlags);
}
return true;
@@ -232,7 +239,7 @@ namespace Game.Collision
return false;
}
public WorldModel acquireModelInstance(string filename)
public WorldModel acquireModelInstance(string filename, uint flags = 0)
{
lock (LoadedModelFilesLock)
{
@@ -248,6 +255,9 @@ namespace Game.Collision
}
Log.outDebug(LogFilter.Maps, "VMapManager: loading file '{0}'", filename);
worldmodel.Flags = flags;
model = new ManagedModel();
model.setModel(worldmodel);
@@ -277,7 +287,7 @@ namespace Game.Collision
}
}
public bool existsMap(uint mapId, uint x, uint y)
public LoadResult existsMap(uint mapId, uint x, uint y)
{
return StaticMapTree.CanLoadMap(VMapPath, mapId, x, y, this);
}