warrentyexpired/ModernUO
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: Adds CUO settings support and adds more robust 7.0.9 support (#945)

Browse source
This commit is contained in:
Kamron Batman 2022-02-27 02:15:06 -08:00 • committed by GitHub
parent 941452de4a
commit 5b7b99e0de
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
12 changed files with 958 additions and 773 deletions
Download patch file Download diff file Expand all files Collapse all files

23
Projects/Server/MultiData.cs
View file

@ -11,7 +11,8 @@ namespace Server
private static readonly BinaryReader m_IndexReader;
private static readonly BinaryReader m_StreamReader;
private static readonly bool UsingUOPFormat;
public static readonly bool PostHSMulFormat;
public static readonly bool UsingUOPFormat;
static MultiData()
{
@ -21,9 +22,13 @@ namespace Server
{
LoadUOP(multiUOPPath);
UsingUOPFormat = true;
PostHSMulFormat = false;
return;
}
// Client version 7.0.9.0+
PostHSMulFormat = UOClient.ServerClientVersion >= ClientVersion.Version7090;
var idxPath = Core.FindDataFile("multi.idx");
var mulPath = Core.FindDataFile("multi.mul");
@ -223,7 +228,7 @@ namespace Server
m_StreamReader.BaseStream.Seek(lookup, SeekOrigin.Begin);
return new MultiComponentList(m_StreamReader, length / (MultiComponentList.PostHSFormat ? 16 : 12));
return new MultiComponentList(m_StreamReader, length / (PostHSMulFormat ? 16 : 12));
}
catch
{
@ -378,15 +383,9 @@ namespace Server
allTiles[i].OffsetX = reader.ReadInt16();
allTiles[i].OffsetY = reader.ReadInt16();
allTiles[i].OffsetZ = reader.ReadInt16();
if (PostHSFormat)
{
allTiles[i].Flags = (TileFlag)reader.ReadUInt64();
}
else
{
allTiles[i].Flags = (TileFlag)reader.ReadUInt32();
}
allTiles[i].Flags = MultiData.PostHSMulFormat
? (TileFlag)reader.ReadUInt64()
: (TileFlag)reader.ReadUInt32();
var e = allTiles[i];
@ -539,7 +538,7 @@ namespace Server
public static void Configure()
{
// OSI Client Patch 7.0.9.0
PostHSFormat = ServerConfiguration.GetOrUpdateSetting("maps.enablePostHSMultiComponentFormat", true);
PostHSFormat = ServerConfiguration.GetSetting("maps.enablePostHSMultiComponentFormat", true);
}
public static bool PostHSFormat { get; set; }