From c6b5b38c18f6cb93cd53530f3067d00a901ceb8e Mon Sep 17 00:00:00 2001 From: kotijekriv Date: Sat, 7 Nov 2026 17:40:33 +0100 Subject: [PATCH 1/2] Fix three files that stopped compiling after the eef6f667a header sync The Ghidra sync eef6f667a renamed DAT_00df5564 to INT_00df5564 (an int now) and INT_00ed279c to BOOLEnum_00ed279c. SetTutorialHintActiveWithTimestamp (0x004BC770), UpdateTutorialStepAndProgress and MenuItemActionHandler_MissionEndscreen_Main still included and named the old ones. They move to main's names; the BOOLEnum store is written TRUE. No header or status line changes. Co-Authored-By: Claude Opus 5.5 --- .../UI/Helpers/SetTutorialHintActiveWithTimestamp.cpp | 4 ++-- src/OpenSHC/UI/Helpers/UpdateTutorialStepAndProgress.cpp | 6 +++--- .../MenuItemActionHandler_MissionEndscreen_Main.cpp | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/OpenSHC/UI/Helpers/SetTutorialHintActiveWithTimestamp.cpp b/src/OpenSHC/UI/Helpers/SetTutorialHintActiveWithTimestamp.cpp index 3f2d9ac4c7..1d5323a211 100644 --- a/src/OpenSHC/UI/Helpers/SetTutorialHintActiveWithTimestamp.cpp +++ b/src/OpenSHC/UI/Helpers/SetTutorialHintActiveWithTimestamp.cpp @@ -1,7 +1,7 @@ #include "OpenSHC/UI/Helpers.func.hpp" -#include "OpenSHC/Globals/DAT_00df5564.hpp" #include "OpenSHC/Globals/DWORD_00df5568.hpp" +#include "OpenSHC/Globals/INT_00df5564.hpp" namespace OpenSHC { namespace UI { @@ -10,7 +10,7 @@ namespace UI { // FUNCTION: STRONGHOLDCRUSADER 0x004BC770 void SetTutorialHintActiveWithTimestamp() { - DAT_00df5564::instance = 1; + INT_00df5564::instance = 1; DWORD_00df5568::instance = timeGetTime(); } diff --git a/src/OpenSHC/UI/Helpers/UpdateTutorialStepAndProgress.cpp b/src/OpenSHC/UI/Helpers/UpdateTutorialStepAndProgress.cpp index 2f86ef966e..7f819bb8fe 100644 --- a/src/OpenSHC/UI/Helpers/UpdateTutorialStepAndProgress.cpp +++ b/src/OpenSHC/UI/Helpers/UpdateTutorialStepAndProgress.cpp @@ -17,7 +17,6 @@ #include "OpenSHC/Globals/DAT_00df5558.hpp" #include "OpenSHC/Globals/DAT_00df555c.hpp" #include "OpenSHC/Globals/DAT_00df5560.hpp" -#include "OpenSHC/Globals/DAT_00df5564.hpp" #include "OpenSHC/Globals/DAT_00df556c.hpp" #include "OpenSHC/Globals/DAT_00df5588.hpp" #include "OpenSHC/Globals/DAT_00df558c.hpp" @@ -33,6 +32,7 @@ #include "OpenSHC/Globals/DWORD_00df5548.hpp" #include "OpenSHC/Globals/DWORD_00df5568.hpp" #include "OpenSHC/Globals/DWORD_00df564c.hpp" +#include "OpenSHC/Globals/INT_00df5564.hpp" #include "OpenSHC/Globals/INT_00df5574.hpp" #include "OpenSHC/Globals/INT_00df557c.hpp" #include "OpenSHC/Globals/INT_00df5580.hpp" @@ -84,8 +84,8 @@ namespace UI { speechPath); } } - if (DAT_00df5564::instance && now - DWORD_00df5568::instance > 1000) { - DAT_00df5564::instance = 0; + if (INT_00df5564::instance && now - DWORD_00df5568::instance > 1000) { + INT_00df5564::instance = 0; } if (!DAT_FileDoesntExist::instance && (DAT_00df5558::instance == 0 || INT_00df5650::instance) && DAT_00df5540::instance == 0 && DAT_00df5558::instance < DAT_00df555c::instance - 1) { diff --git a/src/OpenSHC/UI/MenuItems/MissionEndscreen/MenuItemActionHandler_MissionEndscreen_Main.cpp b/src/OpenSHC/UI/MenuItems/MissionEndscreen/MenuItemActionHandler_MissionEndscreen_Main.cpp index 0a8c211197..1caa3adbb1 100644 --- a/src/OpenSHC/UI/MenuItems/MissionEndscreen/MenuItemActionHandler_MissionEndscreen_Main.cpp +++ b/src/OpenSHC/UI/MenuItems/MissionEndscreen/MenuItemActionHandler_MissionEndscreen_Main.cpp @@ -4,6 +4,7 @@ #include "OpenSHC/Game/GameMode2.hpp" #include "OpenSHC/UI/Enums/BuildingsAndStatusMenuTabType.hpp" +#include "OpenSHC/Globals/BOOLEnum_00ed279c.hpp" #include "OpenSHC/Globals/CHAR_00eb0e44.hpp" #include "OpenSHC/Globals/COL_BLACK.hpp" #include "OpenSHC/Globals/DAT_FinalResultsOrderByColumn.hpp" @@ -11,7 +12,6 @@ #include "OpenSHC/Globals/DAT_PencilRenderCore.hpp" #include "OpenSHC/Globals/DAT_WindowAndDirectDraw.hpp" #include "OpenSHC/Globals/INT_00ec082c.hpp" -#include "OpenSHC/Globals/INT_00ed279c.hpp" namespace OpenSHC { namespace UI { @@ -32,7 +32,7 @@ namespace UI { CHAR_00eb0e44::instance = 0; break; } - INT_00ed279c::instance = 1; + BOOLEnum_00ed279c::instance = TRUE; break; case -100: if (CHAR_00eb0e44::instance != 0) { From 74c47e3f8b847764f2e8841ebe6db09eb955ceb6 Mon Sep 17 00:00:00 2001 From: kotijekriv Date: Sat, 7 Nov 2026 17:40:50 +0100 Subject: [PATCH 2/2] SetTutorialHintActiveWithTimestamp: first include as ../Helpers.func.hpp Style guide rule 14, as most files on main write it; the same header. Co-Authored-By: Claude Opus 5.5 --- src/OpenSHC/UI/Helpers/SetTutorialHintActiveWithTimestamp.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/OpenSHC/UI/Helpers/SetTutorialHintActiveWithTimestamp.cpp b/src/OpenSHC/UI/Helpers/SetTutorialHintActiveWithTimestamp.cpp index 1d5323a211..6b93ca62bc 100644 --- a/src/OpenSHC/UI/Helpers/SetTutorialHintActiveWithTimestamp.cpp +++ b/src/OpenSHC/UI/Helpers/SetTutorialHintActiveWithTimestamp.cpp @@ -1,4 +1,4 @@ -#include "OpenSHC/UI/Helpers.func.hpp" +#include "../Helpers.func.hpp" #include "OpenSHC/Globals/DWORD_00df5568.hpp" #include "OpenSHC/Globals/INT_00df5564.hpp"