added Editor and Sound fixed by Quuz

added instructions on how to report bugs
DiaLight · Dec 15, 2024 · cae70bc · cae70bc
1 parent 9f791f0
commit cae70bc
Show file tree

Hide file tree

Showing 10 changed files with 25 additions and 6 deletions.
diff --git a/readme.md b/readme.md
@@ -3,8 +3,16 @@
 Flame modifies the Dungeon Keeper 2 code to fix the bugs found in both single and multiplayer.
 It works with the Disk, Steam and GOG versions of the game.
 
-If you have any bugs in the game, please describe them in the discord channel: https://discord.gg/RvrQpCFUZc
-When you do, be sure to have followed the recommended installation steps.
+Warning: Saves between Flame and non-Flame Dungeon Keeper 2 versions are [incompatible](https://github.com/DiaLight/Flame/issues/57) for now.
+
+## How to report a bug
+
+1) If you have any bugs in the game, please describe them in the discord channel: https://discord.gg/RvrQpCFUZc or in the GitHub issues.
+2) It helps a lot if you include steps how to reproduce found bug
+3) Attaching a good test map is welcome
+
+If you reporting several bugs, please split them to several Discord messages / GitHub issues. Please, be sure to have followed the recommended installation steps.
+
 
 ## How to install
 1) Go to the [releases](https://github.com/DiaLight/Flame/releases) page and download the Flame-1.7.0-*.zip file of the newest release

diff --git a/resources/CMakeLists.txt b/resources/CMakeLists.txt
@@ -33,5 +33,13 @@ configure_file(
 
 set(DKII_RESOURCES_FILE ${CMAKE_CURRENT_BINARY_DIR}/resources.rc)
 
+# https://keeperklan.com/downloads.php?do=file&id=141
 install(DIRECTORY ${CMAKE_CURRENT_LIST_DIR}/PatchLevels170/ DESTINATION Data/editor/maps)
+
+# https://discord.com/channels/480505152806191114/1289590948702982176/1311063368907362466
+install(DIRECTORY ${CMAKE_CURRENT_LIST_DIR}/PatchSoundByQuuz/ DESTINATION Data/Sound)
+
+# https://discord.com/channels/480505152806191114/1289590948702982176/1311063421818638396
+install(DIRECTORY ${CMAKE_CURRENT_LIST_DIR}/PatchEditorByQuuz/ DESTINATION Data/editor)
+
 install(FILES "${CMAKE_CURRENT_LIST_DIR}/readme.txt" DESTINATION ".")
diff --git a/resources/PatchEditorByQuuz/Graphics/KeeperSpellIcons.bmp b/resources/PatchEditorByQuuz/Graphics/KeeperSpellIcons.bmp
diff --git a/resources/PatchEditorByQuuz/Graphics/TerrainIcons.bmp b/resources/PatchEditorByQuuz/Graphics/TerrainIcons.bmp
diff --git a/resources/PatchEditorByQuuz/maps/Thumbnails/MapColours.png b/resources/PatchEditorByQuuz/maps/Thumbnails/MapColours.png
diff --git a/resources/PatchLevels170/download-url.txt b/resources/PatchLevels170/download-url.txt
diff --git a/resources/PatchSoundByQuuz/MaidenHW.sdt b/resources/PatchSoundByQuuz/MaidenHW.sdt
diff --git a/resources/PatchSoundByQuuz/creature_maidenSFX.map b/resources/PatchSoundByQuuz/creature_maidenSFX.map
diff --git a/resources/readme.txt b/resources/readme.txt
@@ -11,5 +11,8 @@ I need it if I suddenly need to debug an old build
 
 The `Date` folder contains patches for some campaign maps taken from the link https://keeperklan.com/downloads.php?do=file&id=141
 
-If you have any bugs in the game, please describe them in the discord channel https://discord.gg/RvrQpCFUZc
-When report issue please ensure that you are uses `ddraw.dll`
+If you have any bugs in the game, please describe them in the discord channel: https://discord.gg/RvrQpCFUZc or in the GitHub issues.
+It helps a lot if you include steps how to reproduce found bug
+Attaching a good test map is welcome
+If you reporting several bugs, please split them to several Discord messages / GitHub issues
+
diff --git a/tools/devhelper/dev_mouse_dinput_to_user32.cpp b/tools/devhelper/dev_mouse_dinput_to_user32.cpp
@@ -7,7 +7,8 @@
 #include "write_protect.h"
 #include <vector>
 #include <windowsx.h>
-#include <ntstatus.h>
+
+#define STATUS_SUCCESS                   ((NTSTATUS)0x00000000L)    // ntsubauth
 
 // click flags
 #define DK2_Shift 0x01