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/Collision/Models/GameObjectModel.cs
+18 -20
View File
@@ -189,30 +189,28 @@ namespace Game.Collision
}
try
{
using (BinaryReader reader = new(new FileStream(filename, FileMode.Open, FileAccess.Read)))
using BinaryReader reader = new(new FileStream(filename, FileMode.Open, FileAccess.Read));
string magic = reader.ReadStringFromChars(8);
if (magic != MapConst.VMapMagic)
{
string magic = reader.ReadStringFromChars(8);
if (magic != MapConst.VMapMagic)
{
Log.outError(LogFilter.Misc, $"File '{filename}' has wrong header, expected {MapConst.VMapMagic}.");
return;
}
Log.outError(LogFilter.Misc, $"File '{filename}' has wrong header, expected {MapConst.VMapMagic}.");
return;
}
long length = reader.BaseStream.Length;
while (true)
{
if (reader.BaseStream.Position >= length)
break;
long length = reader.BaseStream.Length;
while (true)
{
if (reader.BaseStream.Position >= length)
break;
uint displayId = reader.ReadUInt32();
bool isWmo = reader.ReadBoolean();
int name_length = reader.ReadInt32();
string name = reader.ReadString(name_length);
Vector3 v1 = reader.Read<Vector3>();
Vector3 v2 = reader.Read<Vector3>();
uint displayId = reader.ReadUInt32();
bool isWmo = reader.ReadBoolean();
int name_length = reader.ReadInt32();
string name = reader.ReadString(name_length);
Vector3 v1 = reader.Read<Vector3>();
Vector3 v2 = reader.Read<Vector3>();
StaticModelList.models.Add(displayId, new GameobjectModelData(name, v1, v2, isWmo));
}
StaticModelList.models.Add(displayId, new GameobjectModelData(name, v1, v2, isWmo));
}
}
catch (EndOfStreamException ex)
Source/Game/Collision/Models/WorldModel.cs
+26 -28
View File
@@ -371,40 +371,38 @@ namespace Game.Collision
{
if (!File.Exists(filename))
{
filename = filename + ".vmo";
filename += ".vmo";
if (!File.Exists(filename))
return false;
}
using (BinaryReader reader = new(new FileStream(filename, FileMode.Open, FileAccess.Read)))
using BinaryReader reader = new(new FileStream(filename, FileMode.Open, FileAccess.Read));
if (reader.ReadStringFromChars(8) != MapConst.VMapMagic)
return false;
if (reader.ReadStringFromChars(4) != "WMOD")
return false;
reader.ReadUInt32(); //chunkSize notused
RootWMOID = reader.ReadUInt32();
// read group models
if (reader.ReadStringFromChars(4) != "GMOD")
return false;
uint count = reader.ReadUInt32();
for (var i = 0; i < count; ++i)
{
if (reader.ReadStringFromChars(8) != MapConst.VMapMagic)
return false;
if (reader.ReadStringFromChars(4) != "WMOD")
return false;
reader.ReadUInt32(); //chunkSize notused
RootWMOID = reader.ReadUInt32();
// read group models
if (reader.ReadStringFromChars(4) != "GMOD")
return false;
uint count = reader.ReadUInt32();
for (var i = 0; i < count; ++i)
{
GroupModel group = new();
group.ReadFromFile(reader);
groupModels.Add(group);
}
// read group BIH
if (reader.ReadStringFromChars(4) != "GBIH")
return false;
return groupTree.ReadFromFile(reader);
GroupModel group = new();
group.ReadFromFile(reader);
groupModels.Add(group);
}
// read group BIH
if (reader.ReadStringFromChars(4) != "GBIH")
return false;
return groupTree.ReadFromFile(reader);
}
}
}