diff --git a/DeadRisingEx/DeadRisingEx.vcxproj b/DeadRisingEx/DeadRisingEx.vcxproj index 312b617..f236b8c 100644 --- a/DeadRisingEx/DeadRisingEx.vcxproj +++ b/DeadRisingEx/DeadRisingEx.vcxproj @@ -102,32 +102,32 @@ {4372BE1E-F5FB-4C7E-A03A-958D1886422C} Win32Proj DeadRisingEx - 10.0.16299.0 + 10.0 DynamicLibrary true - v141 + v143 Unicode DynamicLibrary false - v141 + v143 true Unicode DynamicLibrary true - v141 + v143 MultiByte DynamicLibrary false - v141 + v143 true MultiByte diff --git a/DeadRisingEx/DeadRisingEx/MtFramework/Item/uItemImpl.cpp b/DeadRisingEx/DeadRisingEx/MtFramework/Item/uItemImpl.cpp index 10432a9..e5d73cf 100644 --- a/DeadRisingEx/DeadRisingEx/MtFramework/Item/uItemImpl.cpp +++ b/DeadRisingEx/DeadRisingEx/MtFramework/Item/uItemImpl.cpp @@ -173,9 +173,25 @@ __int64 SpawnItem(WCHAR **argv, int argc) ImGuiConsole::Instance()->ConsolePrint(L"Failed to force load object '%S'!\n", sItemPath.c_str()); return 0; } - - // Format the item class name using the item id. - snprintf(sItemClassName, sizeof(sItemClassName), "uOm%02x", itemFileId); + + // Certain items have two DTI instances, one for static objects and one for item objects. Check the item id to see if + // we need to use the item DTI instance instead of the static object DTI. + switch (itemId) + { + case 69: // Queen bee + case 135: // Sniper rifle + { + // Format the item class name using the item id. + snprintf(sItemClassName, sizeof(sItemClassName), "uOm%02x_1", itemFileId); + break; + } + default: + { + // Format the item class name using the item id. + snprintf(sItemClassName, sizeof(sItemClassName), "uOm%02x", itemFileId); + break; + } + } // If an item class name was provided then use that instead of the one we calculated. if (argc >= 2) diff --git a/DeadRisingLauncher/App.config b/DeadRisingLauncher/App.config index 33c2d55..48905d1 100644 --- a/DeadRisingLauncher/App.config +++ b/DeadRisingLauncher/App.config @@ -1,21 +1,21 @@ - + - -
+ +
- + - + True - \ No newline at end of file + diff --git a/DeadRisingLauncher/DeadRisingLauncher.csproj b/DeadRisingLauncher/DeadRisingLauncher.csproj index bbfc5eb..997265f 100644 --- a/DeadRisingLauncher/DeadRisingLauncher.csproj +++ b/DeadRisingLauncher/DeadRisingLauncher.csproj @@ -8,7 +8,7 @@ WinExe DeadRisingLauncher DeadRisingLauncher - v4.6.1 + v4.8 512 true true @@ -27,6 +27,7 @@ false false true + x64 diff --git a/DeadRisingLauncher/Properties/AssemblyInfo.cs b/DeadRisingLauncher/Properties/AssemblyInfo.cs index 2a77210..945428c 100644 --- a/DeadRisingLauncher/Properties/AssemblyInfo.cs +++ b/DeadRisingLauncher/Properties/AssemblyInfo.cs @@ -15,7 +15,7 @@ [assembly: AssemblyCulture("")] // Version informationr( -[assembly: AssemblyVersion("1.5.9.53")] -[assembly: AssemblyFileVersion("1.5.9.53")] +[assembly: AssemblyVersion("1.5.10.58")] +[assembly: AssemblyFileVersion("1.5.10.58")] [assembly: NeutralResourcesLanguageAttribute( "en-US" )] diff --git a/DeadRisingLauncher/Properties/Resources.Designer.cs b/DeadRisingLauncher/Properties/Resources.Designer.cs index 0bff135..8386311 100644 --- a/DeadRisingLauncher/Properties/Resources.Designer.cs +++ b/DeadRisingLauncher/Properties/Resources.Designer.cs @@ -19,7 +19,7 @@ namespace DeadRisingLauncher.Properties { // class via a tool like ResGen or Visual Studio. // To add or remove a member, edit your .ResX file then rerun ResGen // with the /str option, or rebuild your VS project. - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] internal class Resources { diff --git a/DeadRisingLauncher/Properties/Settings.Designer.cs b/DeadRisingLauncher/Properties/Settings.Designer.cs index dfb9e52..a01f360 100644 --- a/DeadRisingLauncher/Properties/Settings.Designer.cs +++ b/DeadRisingLauncher/Properties/Settings.Designer.cs @@ -12,7 +12,7 @@ namespace DeadRisingLauncher.Properties { [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "15.9.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.4.0.0")] internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase { private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); diff --git a/DeadRisingLauncher/packages.config b/DeadRisingLauncher/packages.config index b132111..96bb2c6 100644 --- a/DeadRisingLauncher/packages.config +++ b/DeadRisingLauncher/packages.config @@ -1,5 +1,5 @@  - + \ No newline at end of file diff --git a/LibMtFramework/LibMtFramework.vcxproj b/LibMtFramework/LibMtFramework.vcxproj index 3f0b813..1d21673 100644 --- a/LibMtFramework/LibMtFramework.vcxproj +++ b/LibMtFramework/LibMtFramework.vcxproj @@ -89,32 +89,32 @@ {182F7A1A-DEA6-4800-A52F-2217450064D9} Win32Proj LibMtFramework - 10.0.16299.0 + 10.0 StaticLibrary true - v141 + v143 Unicode StaticLibrary false - v141 + v143 true Unicode StaticLibrary true - v141 + v143 Unicode StaticLibrary false - v141 + v143 true Unicode