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

More Cleanups

Browse Source
This commit is contained in:
hondacrx
2021-06-08 12:56:09 -04:00
parent 302a1f293c
commit 52e43853fe
58 changed files with 223 additions and 257 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Game/DataStorage/M2Storage.cs
+17 -19
View File
@@ -170,27 +170,25 @@ namespace Game.DataStorage
try
{
using (BinaryReader m2file = new(new FileStream(filename, FileMode.Open, FileAccess.Read)))
using BinaryReader m2file = new(new FileStream(filename, FileMode.Open, FileAccess.Read));
// Check file has correct magic (MD21)
if (m2file.ReadUInt32() != 0x3132444D) //"MD21"
{
// Check file has correct magic (MD21)
if (m2file.ReadUInt32() != 0x3132444D) //"MD21"
{
Log.outError(LogFilter.ServerLoading, "Camera file {0} is damaged. File identifier not found.", filename);
continue;
}
m2file.ReadUInt32(); //unknown size
// Read header
M2Header header = m2file.Read<M2Header>();
// Get camera(s) - Main header, then dump them.
m2file.BaseStream.Position = 8 + header.ofsCameras;
M2Camera cam = m2file.Read<M2Camera>();
m2file.BaseStream.Position = 8;
ReadCamera(cam, new BinaryReader(new MemoryStream(m2file.ReadBytes((int)m2file.BaseStream.Length - 8))), cameraEntry);
Log.outError(LogFilter.ServerLoading, "Camera file {0} is damaged. File identifier not found.", filename);
continue;
}
m2file.ReadUInt32(); //unknown size
// Read header
M2Header header = m2file.Read<M2Header>();
// Get camera(s) - Main header, then dump them.
m2file.BaseStream.Position = 8 + header.ofsCameras;
M2Camera cam = m2file.Read<M2Camera>();
m2file.BaseStream.Position = 8;
ReadCamera(cam, new BinaryReader(new MemoryStream(m2file.ReadBytes((int)m2file.BaseStream.Length - 8))), cameraEntry);
}
catch (EndOfStreamException)
{