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

Fixed another crash, and enabled tilelist reading again.

Browse Source
This commit is contained in:
hondacrx
2022-07-25 14:38:31 -04:00
parent d76b8b7751
commit cea897a772
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Game/Conditions/Condition.cs
+2 -2
View File
@@ -126,8 +126,8 @@ namespace Game.Conditions
return false; return false;
} }
Player player = obj.ToPlayer(); Player player = obj?.ToPlayer();
Unit unit = obj.ToUnit(); Unit unit = obj?.ToUnit();
switch (ConditionType) switch (ConditionType)
{ {
Source/Game/Maps/TerrainManager.cs
+4 -3
View File
@@ -179,7 +179,7 @@ namespace Game.Maps
{ {
string tileListName = $"{Global.WorldMgr.GetDataPath()}/maps/{GetId():D4}.tilelist"; string tileListName = $"{Global.WorldMgr.GetDataPath()}/maps/{GetId():D4}.tilelist";
// tile list is optional // tile list is optional
/*if (File.Exists(tileListName)) if (File.Exists(tileListName))
{ {
using var reader = new BinaryReader(new FileStream(tileListName, FileMode.Open, FileAccess.Read)); using var reader = new BinaryReader(new FileStream(tileListName, FileMode.Open, FileAccess.Read));
var mapMagic = reader.ReadUInt32(); var mapMagic = reader.ReadUInt32();
@@ -187,14 +187,15 @@ namespace Game.Maps
if (mapMagic == MapConst.MapMagic && versionMagic == MapConst.MapVersionMagic) if (mapMagic == MapConst.MapMagic && versionMagic == MapConst.MapVersionMagic)
{ {
var build = reader.ReadUInt32(); var build = reader.ReadUInt32();
bool[] tilesData = reader.ReadArray<bool>(MapConst.MaxGrids * MapConst.MaxGrids); byte[] tilesData = reader.ReadArray<byte>(MapConst.MaxGrids * MapConst.MaxGrids);
Array.Reverse(tilesData);
for (int gx = 0; gx < MapConst.MaxGrids; ++gx) for (int gx = 0; gx < MapConst.MaxGrids; ++gx)
for (int gy = 0; gy < MapConst.MaxGrids; ++gy) for (int gy = 0; gy < MapConst.MaxGrids; ++gy)
_gridFileExists[GetBitsetIndex(gx, gy)] = tilesData[GetBitsetIndex(gx, gy)] == 49; // char of 1 _gridFileExists[GetBitsetIndex(gx, gy)] = tilesData[GetBitsetIndex(gx, gy)] == 49; // char of 1
return; return;
} }
}*/ }
for (int gx = 0; gx < MapConst.MaxGrids; ++gx) for (int gx = 0; gx < MapConst.MaxGrids; ++gx)
for (int gy = 0; gy < MapConst.MaxGrids; ++gy) for (int gy = 0; gy < MapConst.MaxGrids; ++gy)