diff --git a/OmsiExtensions.sln b/OmsiExtensions.sln index 61137bc..e93e7ab 100644 --- a/OmsiExtensions.sln +++ b/OmsiExtensions.sln @@ -25,7 +25,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TriggersSample", "_OmsiHook EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "VideoDemo", "_OmsiHookExamples\VideoDemo\VideoDemo.csproj", "{D94FF6D3-08AA-41CB-B9B9-F82E860E6E96}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ClickablePlaneDemo", "_OmsiHookExamples\ClickablePlaneDemo\ClickablePlaneDemo.csproj", "{49428923-732C-4541-8C97-C6D9C004D726}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ClickablePlaneDemo", "_OmsiHookExamples\ClickablePlaneDemo\ClickablePlaneDemo.csproj", "{49428923-732C-4541-8C97-C6D9C004D726}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -97,8 +97,8 @@ Global {CBCB99EF-DD1A-4D4D-A9A8-9BF251FDCD1B}.ReleaseAndDocs|Any CPU.Build.0 = Release|Win32 {CBCB99EF-DD1A-4D4D-A9A8-9BF251FDCD1B}.ReleaseAndDocs|x86.ActiveCfg = Release|Win32 {CBCB99EF-DD1A-4D4D-A9A8-9BF251FDCD1B}.ReleaseAndDocs|x86.Build.0 = Release|Win32 - {CDB17143-5653-48BE-AAC8-8419D5B4FD2C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {CDB17143-5653-48BE-AAC8-8419D5B4FD2C}.Debug|Any CPU.Build.0 = Debug|Any CPU + {CDB17143-5653-48BE-AAC8-8419D5B4FD2C}.Debug|Any CPU.ActiveCfg = Debug|x86 + {CDB17143-5653-48BE-AAC8-8419D5B4FD2C}.Debug|Any CPU.Build.0 = Debug|x86 {CDB17143-5653-48BE-AAC8-8419D5B4FD2C}.Debug|x86.ActiveCfg = Debug|x86 {CDB17143-5653-48BE-AAC8-8419D5B4FD2C}.Debug|x86.Build.0 = Debug|x86 {CDB17143-5653-48BE-AAC8-8419D5B4FD2C}.Release|Any CPU.ActiveCfg = Release|Any CPU diff --git a/OmsiHook/MemArray/MemArrayString.cs b/OmsiHook/MemArray/MemArrayString.cs index 7ed5ae4..212a4ff 100644 --- a/OmsiHook/MemArray/MemArrayString.cs +++ b/OmsiHook/MemArray/MemArrayString.cs @@ -24,7 +24,7 @@ public override string this[int index] { if (cached) arrayCache[index] = value; - Memory.WriteMemoryArrayItemSafe(Address, Memory.AllocateString(value).Result, index); + Memory.WriteMemoryArrayItemSafe(Address, Memory.AllocateString(value, wide).Result, index); } } diff --git a/OmsiHook/OmsiHook.csproj b/OmsiHook/OmsiHook.csproj index 0f0cbba..19dc094 100644 --- a/OmsiHook/OmsiHook.csproj +++ b/OmsiHook/OmsiHook.csproj @@ -10,9 +10,9 @@ OmsiHook is a simple library for hooking into Omsi's memory for modding. true true - 2.5.3.1 - 2.5.3.1 - 2.5.3 + 2.5.4.1 + 2.5.4.1 + 2.5.4 LGPL-3.0-only False README.md diff --git a/OmsiHook/WrappedOmsiClasses/OmsiComplMapObjInst.cs b/OmsiHook/WrappedOmsiClasses/OmsiComplMapObjInst.cs index 16d4125..bdb610b 100644 --- a/OmsiHook/WrappedOmsiClasses/OmsiComplMapObjInst.cs +++ b/OmsiHook/WrappedOmsiClasses/OmsiComplMapObjInst.cs @@ -15,7 +15,7 @@ public class OmsiComplMapObjInst : OmsiPhysObjInst private MemArrayStringDict funcsStrings; private OmsiFuncClass[] funcs; private float[] consts; - private MemArray stringVars; + private MemArrayString stringVars; internal OmsiComplMapObjInst(Memory omsiMemory, int baseAddress) : base(omsiMemory, baseAddress) { } public OmsiComplMapObjInst() : base() { } @@ -196,7 +196,7 @@ public string GetStringVariable(string varName) if (index >= stringVars.Count || index < 0) throw new KeyNotFoundException($"String Variable '{varName}' not found in object. - Index Out Of Bounds"); stringVars.UpdateFromHook(index); - return stringVars[index].String; + return stringVars[index]; } /// diff --git a/OmsiHook/WrappedOmsiClasses/OmsiComplObjInst.cs b/OmsiHook/WrappedOmsiClasses/OmsiComplObjInst.cs index e20331e..307e557 100644 --- a/OmsiHook/WrappedOmsiClasses/OmsiComplObjInst.cs +++ b/OmsiHook/WrappedOmsiClasses/OmsiComplObjInst.cs @@ -77,9 +77,9 @@ public MemArrayPtr PublicVars { get => new(Memory, Memory.ReadMemory(Address + 0x28)); } - public MemArray StringVars + public MemArrayString StringVars { - get => new(Memory, Address + 0x2c, false); + get => new(Memory, Address + 0x2c, true, false); } /* TODO: public OmsiChangeTex[] ChangeTexs diff --git a/OmsiHook/docs/docfx.json b/OmsiHook/docs/docfx.json index fd8cc9f..0941de3 100644 --- a/OmsiHook/docs/docfx.json +++ b/OmsiHook/docs/docfx.json @@ -29,7 +29,7 @@ "_enableNewTab": true, "_disableContribution": true, "_disableBreadcrumb": false, - "_DocumentationVersion": "2.5.3" + "_DocumentationVersion": "2.5.4" }, "content": [ { diff --git a/_OmsiHookExamples/BasicCLI/BasicCLI.csproj b/_OmsiHookExamples/BasicCLI/BasicCLI.csproj index c66fed0..366e4a0 100644 --- a/_OmsiHookExamples/BasicCLI/BasicCLI.csproj +++ b/_OmsiHookExamples/BasicCLI/BasicCLI.csproj @@ -10,7 +10,7 @@ - + diff --git a/_OmsiHookExamples/ClickablePlaneDemo/ClickablePlaneDemo.csproj b/_OmsiHookExamples/ClickablePlaneDemo/ClickablePlaneDemo.csproj index 12bb377..57a0e39 100644 --- a/_OmsiHookExamples/ClickablePlaneDemo/ClickablePlaneDemo.csproj +++ b/_OmsiHookExamples/ClickablePlaneDemo/ClickablePlaneDemo.csproj @@ -10,7 +10,7 @@ - + diff --git a/_OmsiHookExamples/EventSample/EventSample.csproj b/_OmsiHookExamples/EventSample/EventSample.csproj index 1b40390..dc1df40 100644 --- a/_OmsiHookExamples/EventSample/EventSample.csproj +++ b/_OmsiHookExamples/EventSample/EventSample.csproj @@ -11,7 +11,7 @@ - + diff --git a/_OmsiHookExamples/TriggersSample/TriggersSample.csproj b/_OmsiHookExamples/TriggersSample/TriggersSample.csproj index 1ee32ba..396ff9c 100644 --- a/_OmsiHookExamples/TriggersSample/TriggersSample.csproj +++ b/_OmsiHookExamples/TriggersSample/TriggersSample.csproj @@ -11,7 +11,7 @@ - + diff --git a/_OmsiHookExamples/VideoDemo/VideoDemo.csproj b/_OmsiHookExamples/VideoDemo/VideoDemo.csproj index a9498e9..635b181 100644 --- a/_OmsiHookExamples/VideoDemo/VideoDemo.csproj +++ b/_OmsiHookExamples/VideoDemo/VideoDemo.csproj @@ -12,7 +12,7 @@ - +