fixed ai response to threat

added dev helper for windowed game debug
DiaLight · Aug 20, 2024 · 7512809 · 7512809
1 parent 8b9309a
commit 7512809
Show file tree

Hide file tree

Showing 21 changed files with 1,816 additions and 511 deletions.
diff --git a/mapping/DKII_EXE_v170.sgmap b/mapping/DKII_EXE_v170.sgmap
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -11,14 +11,15 @@ add_executable(${TARGET}
         dk2/CGameComponent.cpp
         dk2/PlayerCfg.cpp
         dk2/RegKey.cpp
+        dk2/MyComputerPlayer.cpp
         dk2/entities/entities_type.cpp
         dk2/entities/CCreature.cpp
         dk2/entities/CPlayer.cpp
 
         patches/replace_mouse_dinput_to_user32.cpp
         patches/use_wheel_to_zoom.cpp
         patches/micro_patches.cpp
-        patches/version_patch.cpp
+        patches/game_version_patch.cpp
 
         ${DKII_RESOURCES_FILE}
         )

diff --git a/src/dk2/CGameComponent.cpp b/src/dk2/CGameComponent.cpp
@@ -39,7 +39,7 @@ dk2::CGameComponent *dk2::CGameComponent::mainGuiLoop() {
     if (!MyResources_instance.gameCfg.useFe2d_unk1) this->mt_profiler.constructor2();
     CCommunicationInterface *v2_comm_i;
     v2_comm_i = &CNetworkCommunication_instance;
-    if ( MyResources_instance.gameCfg.useFe != 3 )
+    if ( MyResources_instance.gameCfg.useFe_playMode != 3 )
         v2_comm_i = &CLocalCommunication_instance;
 //    CCommunicationInterface *v32;
 //    v32 = v2_comm_i;  // probably seh
@@ -246,7 +246,7 @@ dk2::CGameComponent *dk2::CGameComponent::mainGuiLoop() {
         useFe3d = MyResources_instance.gameCfg.useFe3d;
         MyResources_instance.gameCfg.useFe2d_unk1 = 0;
     }
-    if ( MyResources_instance.gameCfg.useFe == 3 && !useFe3d ) {
+    if ( MyResources_instance.gameCfg.useFe_playMode == 3 && !useFe3d ) {
         Pos2i pos;
         pos.x = 0;
         pos.y = 0;
@@ -299,8 +299,8 @@ dk2::CGameComponent *dk2::CGameComponent::mainGuiLoop() {
     if ( useFe3d ) return 0;
     if ( MyResources_instance.gameCfg.unk_f16C ) {
         MyResources_instance.gameCfg.useFe3d = 1;
-        MyResources_instance.gameCfg.useFe_unk3 = MyResources_instance.gameCfg.useFe;
-        MyResources_instance.gameCfg.useFe = 5;
+        MyResources_instance.gameCfg.useFe_unk3 = MyResources_instance.gameCfg.useFe_playMode;
+        MyResources_instance.gameCfg.useFe_playMode = 5;
         wcsncpy(MyResources_instance.gameCfg.levelName, L"FrontEnd3DLevel", 64u);
         MyResources_instance.gameCfg.levelName[63] = 0;
         MyResources_instance.gameCfg.hasSaveFile = 0;

diff --git a/src/dk2/MyComputerPlayer.cpp b/src/dk2/MyComputerPlayer.cpp
diff --git a/src/dkii_exe_functions.cpp b/src/dkii_exe_functions.cpp
@@ -11,7 +11,7 @@
 #include "patches/replace_mouse_dinput_to_user32.h"
 #include "patches/micro_patches.h"
 #include "patches/use_wheel_to_zoom.h"
-#include "patches/version_patch.h"
+#include "patches/game_version_patch.h"
 
 
 int32_t dk2::MyGame::isOsCompatible() {
@@ -211,7 +211,7 @@ BOOL __cdecl dk2::parse_command_line(int argc, const char **argv) {
             MyResources_instance.video_settings.cmd_flag_SOFTWAREFILTER = 1;
         } else if (!_strcmpi(*cur_token, "-FE3D")) {  // Defines 3D FrontEnd (?)
             MyResources_instance.gameCfg.useFe3d = 1;
-            MyResources_instance.gameCfg.useFe = 1;
+            MyResources_instance.gameCfg.useFe_playMode = 1;
             wcsncpy(MyResources_instance.gameCfg.levelName, L"FrontEnd3DLevel", 64);
             MyResources_instance.gameCfg.levelName[63] = 0;
             MyResources_instance.gameCfg.hasSaveFile = 0;
@@ -221,7 +221,7 @@ BOOL __cdecl dk2::parse_command_line(int argc, const char **argv) {
             cmd_flag_FrontEnd3D_unk8 = 1;
         } else if (!_strcmpi(*cur_token, "-FE")) {  // Defines 2D FrontEnd (I tried and the screen stayed black so, beware!) (?)
             MyResources_instance.gameCfg.useFe3d = 0;
-            MyResources_instance.gameCfg.useFe = 1;
+            MyResources_instance.gameCfg.useFe_playMode = 1;
             wcsncpy(MyResources_instance.gameCfg.levelName, L"FrontEnd3DLevel", 64);
             MyResources_instance.gameCfg.levelName[63] = 0;
             MyResources_instance.gameCfg.hasSaveFile = 0;
@@ -304,7 +304,7 @@ void __cdecl dk2::CTextBox_renderVersion(dk2::CTextBox *textBox, CFrontEndCompon
     renderer.selectMyCR(&status, 0);
     renderer.selectMyTR(&status, 2);
     wchar_t wstring[64];
-    if(char *version = version_patch::getFileVersion()) {
+    if(char *version = game_version_patch::getFileVersion()) {
         swprintf(wstring, L"%S", version);
     } else {
         swprintf(wstring, L"V%lu.%lu", g_majorVersion, g_minorVersion);

diff --git a/src/main.cpp b/src/main.cpp
@@ -44,10 +44,10 @@ bool dk2::dk2_main2() {
             return false;
         }
         if ( MyResources_instance.gameCfg.f124 ) {
-            MyResources_instance.gameCfg.useFe = 1;
+            MyResources_instance.gameCfg.useFe_playMode = 1;
             MyResources_instance.gameCfg.useFe_unkTy = 3;
         } else if ( MyResources_instance.gameCfg.f128 == 1 ) {
-            MyResources_instance.gameCfg.useFe = 4;
+            MyResources_instance.gameCfg.useFe_playMode = 4;
             MyResources_instance.gameCfg.useFe_unkTy = 3;
         } else if ( !cmd_flag_FrontEnd3D_unk8 ) {
             if ( MyGame_instance.sub_559790() < 240.0 && getDevIdxSupportsLinearPerspective() != -1
@@ -56,7 +56,7 @@ bool dk2::dk2_main2() {
                 MyResources_instance.gameCfg.useFe2d_unk2 = 1;
             }
             MyResources_instance.gameCfg.useFe3d = 1;
-            MyResources_instance.gameCfg.useFe = 5;
+            MyResources_instance.gameCfg.useFe_playMode = 5;
             _wcsncpy(MyResources_instance.gameCfg.levelName, L"FrontEnd3DLevel", 0x40u);
             MyResources_instance.gameCfg.levelName[63] = 0;
             MyResources_instance.gameCfg.hasSaveFile = 0;

diff --git a/src/patches/version_patch.cpp → src/patches/game_version_patch.cpp b/src/patches/version_patch.cpp → src/patches/game_version_patch.cpp
@@ -2,11 +2,11 @@
 // Created by DiaLight on 06.08.2024.
 //
 
-#include "version_patch.h"
+#include "game_version_patch.h"
 #include <Windows.h>
 #include <cstdio>
 
-bool version_patch::enabled = true;
+bool game_version_patch::enabled = true;
 
 bool resolveFileVersion(char *out) {
     bool status = false;
@@ -53,7 +53,7 @@ namespace {
     char versionCache[64] = {0};
 }
 
-char *version_patch::getFileVersion() {
+char *game_version_patch::getFileVersion() {
     if(!enabled) return nullptr;
     if(versionCache[0] == '\0') if(!resolveFileVersion(versionCache)) enabled = false;
     if(versionCache[0] == '\0') return nullptr;

diff --git a/src/patches/game_version_patch.h b/src/patches/game_version_patch.h
@@ -0,0 +1,16 @@
+//
+// Created by DiaLight on 06.08.2024.
+//
+
+#ifndef FLAME_GAME_VERSION_PATCH_H
+#define FLAME_GAME_VERSION_PATCH_H
+
+
+
+namespace game_version_patch {
+    extern bool enabled;
+    char *getFileVersion();
+}
+
+
+#endif //FLAME_GAME_VERSION_PATCH_H
diff --git a/src/patches/micro_patches.cpp b/src/patches/micro_patches.cpp
@@ -20,6 +20,7 @@ bool force_32bit_everything::enabled = true;
 bool disable_bonus_damage::enabled = false;
 bool backstab_fix::enabled = true;
 bool workshop_manufacture_build_time_fix::enabled = true;
+bool response_to_threat_fix::enabled = true;
 bool use_wasd_by_default_patch::enabled = true;
 
 void use_wasd_by_default_patch::useAlternativeName(LPCSTR &lpValueName) {

diff --git a/src/patches/micro_patches.h b/src/patches/micro_patches.h
@@ -40,6 +40,10 @@ namespace workshop_manufacture_build_time_fix {
     extern bool enabled;
 }
 
+namespace response_to_threat_fix {
+    extern bool enabled;
+}
+
 namespace use_wasd_by_default_patch {
     extern bool enabled;
     void useAlternativeName(LPCSTR &lpValueName);

diff --git a/src/patches/version_patch.h b/src/patches/version_patch.h
diff --git a/src/replace_globals.map b/src/replace_globals.map
@@ -50,6 +50,9 @@
 00506B70 int getManufactureRequired(uint16_t);  // ---  /* auto */
 004C3200 int creatureDidWorkshopWork(int, CCreature *);  /* auto */
 
+# CComputerPlayer.h
+004FE0B0 char tickRespondToAttack(char);  // ---------  /* auto */
+
 # PlayerCfg.h
 005604C0 void fillKeyMaps();  // ---------------------  /* auto */
 

diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt
@@ -2,3 +2,6 @@
 add_subdirectory(msvc_mangler)
 add_subdirectory(delinker)
 add_subdirectory(genapi)
+if(DEV_DK2_DIR)
+    add_subdirectory(devhelper)
+endif()
diff --git a/tools/devhelper/CMakeLists.txt b/tools/devhelper/CMakeLists.txt
@@ -0,0 +1,18 @@
+set(TARGET devhelper)
+
+enable_language(ASM_MASM)
+add_library(${TARGET} SHARED
+        dllmain.cpp
+        mimicry.cpp
+        console.cpp
+        game_version.cpp
+        )
+
+target_include_directories(${TARGET} PRIVATE ${CMAKE_CURRENT_LIST_DIR})
+target_compile_definitions(${TARGET} PRIVATE DIRECTINPUT_VERSION=0x0500 DIRECT3D_VERSION=0x0600)
+
+add_custom_command(TARGET ${TARGET} POST_BUILD
+        COMMAND ${CMAKE_COMMAND} -E copy_if_different
+        $<TARGET_FILE:${TARGET}>
+        "${DEV_DK2_DIR}/devht.dll"
+        )
diff --git a/tools/devhelper/console.cpp b/tools/devhelper/console.cpp
@@ -0,0 +1,58 @@
+//
+// Created by DiaLight on 16.08.2024.
+//
+
+#include "console.h"
+#include <Windows.h>
+#include <ios>
+#include <io.h>
+#include <fcntl.h>
+
+
+void RedirectStandardIo() {
+    /* This clever code have been found at:
+    Adding Console I/O to a Win32 GUI App
+    Windows Developer Journal, December 1997
+    http://dslweb.nwnexus.com/~ast/dload/guicon.htm
+    Andrew Tucker's Home Page */
+
+    // redirect unbuffered STDOUT to the console
+    long lStdHandle = (long)GetStdHandle(STD_OUTPUT_HANDLE);
+    int hConHandle = _open_osfhandle(lStdHandle, _O_TEXT);
+    if(hConHandle > 0) {
+        FILE *fp = _fdopen(hConHandle, "w");
+        *stdout = *fp;
+        setvbuf(stdout, NULL, _IONBF, 0);
+    }
+
+    // redirect unbuffered STDIN to the console
+    lStdHandle = (long)GetStdHandle(STD_INPUT_HANDLE);
+    hConHandle = _open_osfhandle(lStdHandle, _O_TEXT);
+    if(hConHandle > 0) {
+        FILE *fp = _fdopen( hConHandle, "r" );
+        *stdin = *fp;
+        setvbuf(stdin, NULL, _IONBF, 0);
+    }
+
+    // redirect unbuffered STDERR to the console
+    lStdHandle = (long)GetStdHandle(STD_ERROR_HANDLE);
+    hConHandle = _open_osfhandle(lStdHandle, _O_TEXT);
+    if(hConHandle > 0) {
+        FILE *fp = _fdopen(hConHandle, "w");
+        *stderr = *fp;
+        setvbuf(stderr, NULL, _IONBF, 0 );
+    }
+
+    // make cout, wcout, cin, wcin, wcerr, cerr, wclog and clog point to console as well
+    std::ios::sync_with_stdio();
+}
+
+
+bool initConsole() {
+    AllocConsole();
+    freopen_s((FILE**)stdout, "CONOUT$", "w", stdout);
+    freopen_s((FILE**)stderr, "CONOUT$", "w", stderr);
+
+    RedirectStandardIo();
+    return true;
+}
diff --git a/tools/devhelper/console.h b/tools/devhelper/console.h
@@ -0,0 +1,12 @@
+//
+// Created by DiaLight on 16.08.2024.
+//
+
+#ifndef FLAME_CONSOLE_H
+#define FLAME_CONSOLE_H
+
+
+bool initConsole();
+
+
+#endif //FLAME_CONSOLE_H