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

Merge develop into master for 3.0.4.0
mir-diablo-ii-tools · Apr 15, 2023 · bdd3ebe · bdd3ebe
2 parents 14ffbcf + 89d5331
commit bdd3ebe
Show file tree

Hide file tree

Showing 434 changed files with 719 additions and 462 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,19 @@
   - Remove requirement to install C/C++ runtime files, as they are
     included with every Windows since Windows 95 OSR 2.
 
+## SGD2FreeRes 3.0.4.0 (April 15, 2023)
+- Add support for the D2GL Glide and DDraw wrappers. Credits to
+  bayaraa for the implementation.
+
+## SGD2FreeRes 3.0.3.1d (April 15, 2023)
+- Add NOWD server to the supported server list.
+
+## SGD2FreeRes 3.0.3.1c (April 15, 2023)
+- Add D2infinitum server to the supported server list.
+
+## SGD2FreeRes 3.0.3.1b (November 11, 2022)
+- Add Firesnake's ESR servers to the supported server list.
+
 ## SGD2FreeRes 3.0.3.1 (October 27, 2022)
 - Extended the tile culling even more, to lessen the tile culling
   problem in D2DX with motion prediction enabled.

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,5 +1,5 @@
 # SlashGaming Diablo II Free Resolution
-# Copyright (C) 2019-2022  Mir Drualga
+# Copyright (C) 2019-2023  Mir Drualga
 #
 # This file is part of SlashGaming Diablo II Free Resolution.
 #
@@ -87,6 +87,7 @@ set(CPP_FILES
     "${PROJECT_DIR}/src/helper/file_version.cc"
     "${PROJECT_DIR}/src/helper/game_resolution.cc"
     "${PROJECT_DIR}/src/helper/glide3x_d2dx.cpp"
+    "${PROJECT_DIR}/src/helper/glide3x_d2gl.cpp"
     "${PROJECT_DIR}/src/helper/glide3x_version.cc"
     "${PROJECT_DIR}/src/helper/patch_address_and_size.cpp"
     "${PROJECT_DIR}/src/helper/position_realignment.cc"

diff --git a/LICENSE.md b/LICENSE.md
@@ -1,5 +1,5 @@
 # SlashGaming Diablo II Free Resolution
-Copyright (C) 2019-2022  Mir Drualga
+Copyright (C) 2019-2023  Mir Drualga
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU Affero General Public License as published

diff --git a/README.md b/README.md
@@ -11,8 +11,8 @@ This is a project aimed at modding Diablo II to support any resolution.
 - Supports multiple video modes.
   - Supports standard GDI mode. Resolutions are unrestricted.
   - Supports standard DirectDraw and Direct3D modes, restricted to "standard" resolutions.
-  - Supports CnC-DDraw wrapper. Resolutions are unrestricted.
-  - Supports [Sven's Glide wrapper](http://www.svenswrapper.de/english/), [nGlide](https://www.zeus-software.com/), and [D2DX](https://github.com/bolrog/d2dx) Glide wrapper. Resolutions are unrestricted.
+  - Supports CnC-DDraw wrapper and [D2GL DDraw Wrapper](https://github.com/bayaraa/d2gl). Resolutions are unrestricted.
+  - Supports [Sven's Glide wrapper](http://www.svenswrapper.de/english/), [nGlide](https://www.zeus-software.com/), [D2DX](https://github.com/bolrog/d2dx), and [D2GL Glide Wrapper](https://github.com/bayaraa/d2gl). Resolutions are unrestricted.
 - Compatibility with select modsystems.
   - [PlugY](http://plugy.free.fr/en/index.html)
   - [D2SE](https://snej.org/forum/index2.php?topic=18954.msg459574#msg459574)
@@ -30,11 +30,10 @@ Servers that permit SGD2FreeRes:
 - [SlashDiablo](https://slashdiablo.net/): 640x480, 800x600, 856x480, 1068x600
 - [Resurgence](https://resurgence.slashgaming.net/): 640x480, 800x600, 856x480, 1068x600
 - [Project Diablo 2](https://www.projectdiablo2.com/): 640x480, 800x600, 856x480, 1068x600
-- [D2LOD.NET](http://d2lod.net/): 640x480, 800x600, 856x480, 1024x768, 1068x600
 - And more...
 
 ## Contribution
-SGD2FreeRes is coded in C++20. It currently is intended to compile with Visual Studio 2019.
+SGD2FreeRes is coded in C++20. It currently is intended to compile with Visual Studio 2022.
 
 When you submit a pull request, you certify that the code in the pull request is AGPLv3+ compatible. You also certify that you have authorization to submit the pull request with the code changes. You certify that the merging of the pull request with those changes is authorized under the license terms of the AGPLv3+. Finally, you certify that the contribution is licensed under the AGPLv3+.
 
@@ -45,6 +44,7 @@ When you submit a pull request, you certify that the code in the pull request is
 - [Jarcho](https://github.com/Jarcho): For adding support for 1.10 and 1.12A.
 - Szumigajowy: For supplying the starting point for the tile culling boundary patch.
 - Necrolis: All-round code editing genius. Provides good advice.
+- [bayaraa](https://github.com/bayaraa): For creating D2GL and directly adding support for it.
 
 ## 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/CMakeLists.txt b/SlashGaming-Diablo-II-Free-Resolution/CMakeLists.txt
@@ -1,5 +1,5 @@
 # SlashGaming Diablo II Free Resolution
-# Copyright (C) 2019-2022  Mir Drualga
+# Copyright (C) 2019-2023  Mir Drualga
 #
 # This file is part of SlashGaming Diablo II Free Resolution.
 #

diff --git a/SlashGaming-Diablo-II-Free-Resolution/include/dllexport_define.inc b/SlashGaming-Diablo-II-Free-Resolution/include/dllexport_define.inc
@@ -1,6 +1,6 @@
 /**
  * SlashGaming Diablo II Free Resolution
- * Copyright (C) 2019-2022  Mir Drualga
+ * Copyright (C) 2019-2023  Mir Drualga
  *
  * This file is part of SlashGaming Diablo II Free Resolution.
  *

diff --git a/SlashGaming-Diablo-II-Free-Resolution/include/dllexport_undefine.inc b/SlashGaming-Diablo-II-Free-Resolution/include/dllexport_undefine.inc
@@ -1,6 +1,6 @@
 /**
  * SlashGaming Diablo II Free Resolution
- * Copyright (C) 2019-2022  Mir Drualga
+ * Copyright (C) 2019-2023  Mir Drualga
  *
  * This file is part of SlashGaming Diablo II Free Resolution.
  *

diff --git a/SlashGaming-Diablo-II-Free-Resolution/include/license.h b/SlashGaming-Diablo-II-Free-Resolution/include/license.h
@@ -1,6 +1,6 @@
 /**
  * SlashGaming Diablo II Free Resolution
- * Copyright (C) 2019-2022  Mir Drualga
+ * Copyright (C) 2019-2023  Mir Drualga
  *
  * This file is part of SlashGaming Diablo II Free Resolution.
  *

diff --git a/SlashGaming-Diablo-II-Free-Resolution/include/sgd2fml_mod_exports.h b/SlashGaming-Diablo-II-Free-Resolution/include/sgd2fml_mod_exports.h
@@ -1,6 +1,6 @@
 /**
  * SlashGaming Diablo II Free Resolution
- * Copyright (C) 2019-2022  Mir Drualga
+ * Copyright (C) 2019-2023  Mir Drualga
  *
  * This file is part of SlashGaming Diablo II Free Resolution.
  *

diff --git a/SlashGaming-Diablo-II-Free-Resolution/resource/resource.rc b/SlashGaming-Diablo-II-Free-Resolution/resource/resource.rc
@@ -1,6 +1,6 @@
 /**
  * SlashGaming Diablo II Free Resolution
- * Copyright (C) 2019-2022  Mir Drualga
+ * Copyright (C) 2019-2023  Mir Drualga
  *
  * This file is part of SlashGaming Diablo II Free Resolution.
  *
@@ -55,8 +55,8 @@ SLASH_ICON ICON "slashgaming_game_loader.ico"
 LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 
 VS_VERSION_INFO    VERSIONINFO
-  FILEVERSION      3,0,3,1
-  PRODUCTVERSION   3,0,3,1
+  FILEVERSION      3,0,4,0
+  PRODUCTVERSION   3,0,4,0
   FILEFLAGSMASK    0x3fL // VS_FFI_FILEFLAGSMASK
 #ifdef _DEBUG
   FILEFLAGS        0x1L  // VS_FF_DEBUG|VS_FF_PRIVATEBUILD|VS_FF_PRERELEASE
@@ -71,19 +71,19 @@ VS_VERSION_INFO    VERSIONINFO
   {
     BLOCK "040904E4" // Lang=US English, CharSet=Windows Multilingual
     {
-      VALUE "Build",            "2022-10-27\0"
-      VALUE "Comments",         "Licensed under Affero GPL v3+.\0"
-      VALUE "CompanyName",      "SlashGaming\0"
-      VALUE "Developer",        "Mir Drualga\0"
-      VALUE "FileDescription",  "Enables customized video resolutions in Diablo II.\0"
-      VALUE "InternalName",     "SlashGaming Diablo II Free Resolution\0"
-      VALUE "LegalCopyright",   "Copyright (C) 2019 - 2022  Mir Drualga\0"
-      VALUE "LegalTrademarks",  "All rights reserved.\0"
-      VALUE "PrivateBuild",     "\0"
-      VALUE "ProductName",      "Diablo II Free Resolution\0"
-      VALUE "ProductVersion",   "3.0.3.1\0"
-      VALUE "SpecialBuild",     "\0"
-      VALUE "Support",          "reddit.com/r/SlashDiablo\0"
+      VALUE "Build",            "2023-04-15"
+      VALUE "Comments",         "Licensed under Affero GPL v3+."
+      VALUE "CompanyName",      "SlashGaming"
+      VALUE "Developer",        "Mir Drualga"
+      VALUE "FileDescription",  "Enables customized video resolutions in Diablo II."
+      VALUE "InternalName",     "SlashGaming Diablo II Free Resolution"
+      VALUE "LegalCopyright",   "Copyright (C) 2019 - 2023  Mir Drualga"
+      VALUE "LegalTrademarks",  "All rights reserved."
+      VALUE "PrivateBuild",     ""
+      VALUE "ProductName",      "Diablo II Free Resolution"
+      VALUE "ProductVersion",   "3.0.4.0"
+      VALUE "SpecialBuild",     ""
+      VALUE "Support",          "reddit.com/r/SlashDiablo"
     } // BLOCK "040904E4"
   } // BLOCK "StringFileInfo"
   BLOCK "VarFileInfo"

diff --git a/SlashGaming-Diablo-II-Free-Resolution/src/CMakeLists.txt b/SlashGaming-Diablo-II-Free-Resolution/src/CMakeLists.txt
@@ -1,5 +1,5 @@
 # SlashGaming Diablo II Free Resolution
-# Copyright (C) 2019-2022  Mir Drualga
+# Copyright (C) 2019-2023  Mir Drualga
 #
 # This file is part of SlashGaming Diablo II Free Resolution.
 #

diff --git a/SlashGaming-Diablo-II-Free-Resolution/src/compile_time_switch.hpp b/SlashGaming-Diablo-II-Free-Resolution/src/compile_time_switch.hpp
@@ -1,6 +1,6 @@
 /**
  * SlashGaming Diablo II Free Resolution
- * Copyright (C) 2019-2022  Mir Drualga
+ * Copyright (C) 2019-2023  Mir Drualga
  *
  * This file is part of SlashGaming Diablo II Free Resolution.
  *

diff --git a/SlashGaming-Diablo-II-Free-Resolution/src/config.cc b/SlashGaming-Diablo-II-Free-Resolution/src/config.cc
@@ -1,6 +1,6 @@
 /**
  * SlashGaming Diablo II Free Resolution
- * Copyright (C) 2019-2022  Mir Drualga
+ * Copyright (C) 2019-2023  Mir Drualga
  *
  * This file is part of SlashGaming Diablo II Free Resolution.
  *

diff --git a/SlashGaming-Diablo-II-Free-Resolution/src/config.hpp b/SlashGaming-Diablo-II-Free-Resolution/src/config.hpp
@@ -1,6 +1,6 @@
 /**
  * SlashGaming Diablo II Free Resolution
- * Copyright (C) 2019-2022  Mir Drualga
+ * Copyright (C) 2019-2023  Mir Drualga
  *
  * This file is part of SlashGaming Diablo II Free Resolution.
  *

diff --git a/SlashGaming-Diablo-II-Free-Resolution/src/dll_main.cc b/SlashGaming-Diablo-II-Free-Resolution/src/dll_main.cc
@@ -1,6 +1,6 @@
 /**
  * SlashGaming Diablo II Free Resolution
- * Copyright (C) 2019-2022  Mir Drualga
+ * Copyright (C) 2019-2023  Mir Drualga
  *
  * This file is part of SlashGaming Diablo II Free Resolution.
  *

diff --git a/SlashGaming-Diablo-II-Free-Resolution/src/helper/800_interface_bar.cc b/SlashGaming-Diablo-II-Free-Resolution/src/helper/800_interface_bar.cc
@@ -1,6 +1,6 @@
 /**
  * SlashGaming Diablo II Free Resolution
- * Copyright (C) 2019-2022  Mir Drualga
+ * Copyright (C) 2019-2023  Mir Drualga
  *
  * This file is part of SlashGaming Diablo II Free Resolution.
  *

diff --git a/SlashGaming-Diablo-II-Free-Resolution/src/helper/800_interface_bar.hpp b/SlashGaming-Diablo-II-Free-Resolution/src/helper/800_interface_bar.hpp
@@ -1,6 +1,6 @@
 /**
  * SlashGaming Diablo II Free Resolution
- * Copyright (C) 2019-2022  Mir Drualga
+ * Copyright (C) 2019-2023  Mir Drualga
  *
  * This file is part of SlashGaming Diablo II Free Resolution.
  *

diff --git a/SlashGaming-Diablo-II-Free-Resolution/src/helper/abstract_multiversion_patch.cpp b/SlashGaming-Diablo-II-Free-Resolution/src/helper/abstract_multiversion_patch.cpp
@@ -1,6 +1,6 @@
 /**
  * SlashGaming Diablo II Free Resolution
- * Copyright (C) 2019-2022  Mir Drualga
+ * Copyright (C) 2019-2023  Mir Drualga
  *
  * This file is part of SlashGaming Diablo II Free Resolution.
  *

diff --git a/SlashGaming-Diablo-II-Free-Resolution/src/helper/abstract_multiversion_patch.hpp b/SlashGaming-Diablo-II-Free-Resolution/src/helper/abstract_multiversion_patch.hpp
@@ -1,6 +1,6 @@
 /**
  * SlashGaming Diablo II Free Resolution
- * Copyright (C) 2019-2022  Mir Drualga
+ * Copyright (C) 2019-2023  Mir Drualga
  *
  * This file is part of SlashGaming Diablo II Free Resolution.
  *

diff --git a/SlashGaming-Diablo-II-Free-Resolution/src/helper/abstract_version_patch.cpp b/SlashGaming-Diablo-II-Free-Resolution/src/helper/abstract_version_patch.cpp
@@ -1,6 +1,6 @@
 /**
  * SlashGaming Diablo II Free Resolution
- * Copyright (C) 2019-2022  Mir Drualga
+ * Copyright (C) 2019-2023  Mir Drualga
  *
  * This file is part of SlashGaming Diablo II Free Resolution.
  *

diff --git a/SlashGaming-Diablo-II-Free-Resolution/src/helper/abstract_version_patch.hpp b/SlashGaming-Diablo-II-Free-Resolution/src/helper/abstract_version_patch.hpp
@@ -1,6 +1,6 @@
 /**
  * SlashGaming Diablo II Free Resolution
- * Copyright (C) 2019-2022  Mir Drualga
+ * Copyright (C) 2019-2023  Mir Drualga
  *
  * This file is part of SlashGaming Diablo II Free Resolution.
  *

diff --git a/SlashGaming-Diablo-II-Free-Resolution/src/helper/cel_file_collection.cc b/SlashGaming-Diablo-II-Free-Resolution/src/helper/cel_file_collection.cc
@@ -1,6 +1,6 @@
 /**
  * SlashGaming Diablo II Free Resolution
- * Copyright (C) 2019-2022  Mir Drualga
+ * Copyright (C) 2019-2023  Mir Drualga
  *
  * This file is part of SlashGaming Diablo II Free Resolution.
  *

diff --git a/SlashGaming-Diablo-II-Free-Resolution/src/helper/cel_file_collection.hpp b/SlashGaming-Diablo-II-Free-Resolution/src/helper/cel_file_collection.hpp
@@ -1,6 +1,6 @@
 /**
  * SlashGaming Diablo II Free Resolution
- * Copyright (C) 2019-2022  Mir Drualga
+ * Copyright (C) 2019-2023  Mir Drualga
  *
  * This file is part of SlashGaming Diablo II Free Resolution.
  *

diff --git a/SlashGaming-Diablo-II-Free-Resolution/src/helper/cel_file_collection_asm.asm b/SlashGaming-Diablo-II-Free-Resolution/src/helper/cel_file_collection_asm.asm
@@ -1,6 +1,6 @@
 ;
 ; SlashGaming Diablo II Free Resolution
-; Copyright (C) 2019-2022  Mir Drualga
+; Copyright (C) 2019-2023  Mir Drualga
 ;
 ; This file is part of SlashGaming Diablo II Free Resolution.
 ;

diff --git a/SlashGaming-Diablo-II-Free-Resolution/src/helper/checksum_hash.c b/SlashGaming-Diablo-II-Free-Resolution/src/helper/checksum_hash.c
@@ -1,6 +1,6 @@
 /**
  * SlashGaming Diablo II Free Resolution
- * Copyright (C) 2019-2022  Mir Drualga
+ * Copyright (C) 2019-2023  Mir Drualga
  *
  * This file is part of SlashGaming Diablo II Free Resolution.
  *

diff --git a/SlashGaming-Diablo-II-Free-Resolution/src/helper/checksum_hash.h b/SlashGaming-Diablo-II-Free-Resolution/src/helper/checksum_hash.h
@@ -1,6 +1,6 @@
 /**
  * SlashGaming Diablo II Free Resolution
- * Copyright (C) 2019-2022  Mir Drualga
+ * Copyright (C) 2019-2023  Mir Drualga
  *
  * This file is part of SlashGaming Diablo II Free Resolution.
  *

diff --git a/SlashGaming-Diablo-II-Free-Resolution/src/helper/custom_mpq.cc b/SlashGaming-Diablo-II-Free-Resolution/src/helper/custom_mpq.cc
@@ -1,6 +1,6 @@
 /**
  * SlashGaming Diablo II Free Resolution
- * Copyright (C) 2019-2022  Mir Drualga
+ * Copyright (C) 2019-2023  Mir Drualga
  *
  * This file is part of SlashGaming Diablo II Free Resolution.
  *

diff --git a/SlashGaming-Diablo-II-Free-Resolution/src/helper/custom_mpq.hpp b/SlashGaming-Diablo-II-Free-Resolution/src/helper/custom_mpq.hpp
@@ -1,6 +1,6 @@
 /**
  * SlashGaming Diablo II Free Resolution
- * Copyright (C) 2019-2022  Mir Drualga
+ * Copyright (C) 2019-2023  Mir Drualga
  *
  * This file is part of SlashGaming Diablo II Free Resolution.
  *

diff --git a/SlashGaming-Diablo-II-Free-Resolution/src/helper/ddraw_version.cc b/SlashGaming-Diablo-II-Free-Resolution/src/helper/ddraw_version.cc
@@ -1,6 +1,6 @@
 /**
  * SlashGaming Diablo II Free Resolution
- * Copyright (C) 2019-2022  Mir Drualga
+ * Copyright (C) 2019-2023  Mir Drualga
  *
  * This file is part of SlashGaming Diablo II Free Resolution.
  *
@@ -61,6 +61,10 @@ ::std::string_view GetName(DDrawVersion ddraw_version) {
       return "CnC-DDraw";
     }
 
+    case DDrawVersion::kD2gl: {
+      return "D2GL";
+    }
+
     default: {
       ::mdc::error::ExitOnConstantMappingError(
           __FILEW__,

diff --git a/SlashGaming-Diablo-II-Free-Resolution/src/helper/ddraw_version.hpp b/SlashGaming-Diablo-II-Free-Resolution/src/helper/ddraw_version.hpp
@@ -1,6 +1,6 @@
 /**
  * SlashGaming Diablo II Free Resolution
- * Copyright (C) 2019-2022  Mir Drualga
+ * Copyright (C) 2019-2023  Mir Drualga
  *
  * This file is part of SlashGaming Diablo II Free Resolution.
  *
@@ -53,6 +53,7 @@ namespace sgd2fr {
 enum class DDrawVersion {
   kWindowsDefault,
   kCnC,
+  kD2gl,
 };
 
 namespace ddraw_version {

diff --git a/SlashGaming-Diablo-II-Free-Resolution/src/helper/evaluation.c b/SlashGaming-Diablo-II-Free-Resolution/src/helper/evaluation.c
@@ -1,6 +1,6 @@
 /**
  * SlashGaming Diablo II Free Resolution
- * Copyright (C) 2019-2022  Mir Drualga
+ * Copyright (C) 2019-2023  Mir Drualga
  *
  * This file is part of SlashGaming Diablo II Free Resolution.
  *

diff --git a/SlashGaming-Diablo-II-Free-Resolution/src/helper/evaluation.h b/SlashGaming-Diablo-II-Free-Resolution/src/helper/evaluation.h
@@ -1,6 +1,6 @@
 /**
  * SlashGaming Diablo II Free Resolution
- * Copyright (C) 2019-2022  Mir Drualga
+ * Copyright (C) 2019-2023  Mir Drualga
  *
  * This file is part of SlashGaming Diablo II Free Resolution.
  *

diff --git a/SlashGaming-Diablo-II-Free-Resolution/src/helper/file_string.cc b/SlashGaming-Diablo-II-Free-Resolution/src/helper/file_string.cc
@@ -1,6 +1,6 @@
 /**
  * SlashGaming Diablo II Free Resolution
- * Copyright (C) 2019-2022  Mir Drualga
+ * Copyright (C) 2019-2023  Mir Drualga
  *
  * This file is part of SlashGaming Diablo II Free Resolution.
  *
@@ -86,8 +86,9 @@ struct FileStringTableEntryCompareKey {
 
 static constexpr const std::array<
     FileStringTableEntry,
-    1
+    2
 > kFileStringSortedTable = {{
+    { L"D2GL", DDrawVersion::kD2gl },
     { L"cnc-ddraw", DDrawVersion::kCnC },
 }};
 

diff --git a/SlashGaming-Diablo-II-Free-Resolution/src/helper/file_string.hpp b/SlashGaming-Diablo-II-Free-Resolution/src/helper/file_string.hpp
@@ -1,6 +1,6 @@
 /**
  * SlashGaming Diablo II Free Resolution
- * Copyright (C) 2019-2022  Mir Drualga
+ * Copyright (C) 2019-2023  Mir Drualga
  *
  * This file is part of SlashGaming Diablo II Free Resolution.
  *

diff --git a/SlashGaming-Diablo-II-Free-Resolution/src/helper/file_version.cc b/SlashGaming-Diablo-II-Free-Resolution/src/helper/file_version.cc
@@ -1,6 +1,6 @@
 /**
  * SlashGaming Diablo II Free Resolution
- * Copyright (C) 2019-2022  Mir Drualga
+ * Copyright (C) 2019-2023  Mir Drualga
  *
  * This file is part of SlashGaming Diablo II Modding API for C++. It
  * has been copied and retooled for reading glide3x.dll.