Merge pull request #46 from mir-diablo-ii-tools/develop

Merge develop into master
mir-diablo-ii-tools · Jun 9, 2021 · b2fed13 · b2fed13
2 parents 3fff14e + 0065db2
commit b2fed13
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 10 deletions.
diff --git a/README.md b/README.md
@@ -42,7 +42,7 @@ When you submit a pull request, you certify that the code in the pull request is
 ## Thanks
 - [/r/SlashDiablo](https://www.reddit.com/r/slashdiablo/): The community that got me started. The whole reason the project took off.
 - [PhrozenKeep](https://d2mods.info/): Community with plenty of information on Diablo II, modding, and resources.
-- [balrog](https://github.com/bolrog): For providing an extended API to enable interfacing with the D2DX Glide wrapper.
+- [bolrog](https://github.com/bolrog): For providing an extended API to enable interfacing with the D2DX Glide wrapper.
 
 ## Legal
 The project is licensed under the terms of the Affero General Public License, version 3 or higher, with exceptions. Components may be licensed under other terms, so check LICENSE for more details. If you wish to apply for a proprietary license exception, please contact Mir Drualga on the SlashDiablo Discord channel.

diff --git a/SlashGaming-Diablo-II-Free-Resolution/resource/resource.rc b/SlashGaming-Diablo-II-Free-Resolution/resource/resource.rc
@@ -55,8 +55,8 @@ SLASH_ICON ICON "slashgaming_game_loader.ico"
 LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 
 VS_VERSION_INFO    VERSIONINFO
-  FILEVERSION      3,0,2,0
-  PRODUCTVERSION   3,0,2,0
+  FILEVERSION      3,0,2,1
+  PRODUCTVERSION   3,0,2,1
   FILEFLAGSMASK    0x3fL // VS_FFI_FILEFLAGSMASK
 #ifdef _DEBUG
   FILEFLAGS        0x1L  // VS_FF_DEBUG|VS_FF_PRIVATEBUILD|VS_FF_PRERELEASE
@@ -71,7 +71,7 @@ VS_VERSION_INFO    VERSIONINFO
   {
     BLOCK "040904E4" // Lang=US English, CharSet=Windows Multilingual
     {
-      VALUE "Build",            "2021-05-01\0"
+      VALUE "Build",            "2021-06-09\0"
       VALUE "Comments",         "Licensed under Affero GPL v3+.\0"
       VALUE "CompanyName",      "SlashGaming\0"
       VALUE "Developer",        "Mir Drualga\0"
@@ -81,7 +81,7 @@ VS_VERSION_INFO    VERSIONINFO
       VALUE "LegalTrademarks",  "All rights reserved.\0"
       VALUE "PrivateBuild",     "\0"
       VALUE "ProductName",      "Diablo II Free Resolution\0"
-      VALUE "ProductVersion",   "3.0.2.0\0"
+      VALUE "ProductVersion",   "3.0.2.1\0"
       VALUE "SpecialBuild",     "\0"
       VALUE "Support",          "reddit.com/r/SlashDiablo\0"
     } // BLOCK "040904E4"

diff --git a/SlashGaming-Diablo-II-Free-Resolution/src/config.cc b/SlashGaming-Diablo-II-Free-Resolution/src/config.cc
@@ -55,6 +55,7 @@
 #include <mdc/wchar_t/filew.h>
 #include <mjsoni/rapid_json_config_reader.hpp>
 #include "compile_time_switch.hpp"
+#include "helper/game_resolution.hpp"
 
 namespace sgd2fr::config {
 namespace {
@@ -714,8 +715,8 @@ unsigned int GetIngameResolutionMode() {
                 kIngameResolutionModeKey
             );
 
-        if (ingame_resolution_mode > GetIngameResolutions().size()) {
-          ingame_resolution_mode = kDefaultIngameResolutionMode;
+        if (ingame_resolution_mode > GetMaxConfigResolutionId()) {
+          ingame_resolution_mode = GetMinConfigResolutionId();
         }
       }
   );

diff --git a/...lient_get_resolution_registry_patch/d2client_get_resolution_registry_patch_1_09d_shim.asm b/...lient_get_resolution_registry_patch/d2client_get_resolution_registry_patch_1_09d_shim.asm
@@ -83,9 +83,6 @@ _D2Client_GetResolutionRegistryPatch_1_09D_InterceptionFunc01:
     ret
 
 _D2Client_GetResolutionRegistryPatch_1_09D_InterceptionFunc03:
-    ; Original code
-    mov eax, [eax]
-
     push ebp
     mov ebp, esp