Repository navigation
Fix three files that stopped compiling after the eef6f667a header sync - #368
Merged
Merged
Conversation
The Ghidra sync eef6f66 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 <noreply@anthropic.com>
Style guide rule 14, as most files on main write it; the same header. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This was referenced Nov 7, 2026
gynt
approved these changes
Nov 7, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Main (eef6f66) has three
.cppfiles that no longer compile in a clean build: the Ghidra sync eef6f66 renamedDAT_00df5564toINT_00df5564(and declared itint) andINT_00ed279ctoBOOLEnum_00ed279c, and these files still include and name the old ones. This PR moves them to main's names and changes nothing else: no header and no status line. The three functions stay at 100%, the same as their status lines. They're the only uses of the old names left on main.UI/Helpers/SetTutorialHintActiveWithTimestamp.cppDAT_00df5564INT_00df5564UI/Helpers/UpdateTutorialStepAndProgress.cppDAT_00df5564INT_00df5564UI/MenuItems/MissionEndscreen/MenuItemActionHandler_MissionEndscreen_Main.cppINT_00ed279c = 1BOOLEnum_00ed279c = TRUEThe include lines follow the names, sorted by clang-format. SetTutorialHintActiveWithTimestamp's first include is now written
"../Helpers.func.hpp", as the style guide's rule 14 asks; it's the same header.Built with the bundled MSVC1400-SP1, natively on Windows, against the Steam
Stronghold Crusader.exe(3bb0a8c1…5387ac5a). Every.cppundersrc/OpenSHCcompiled (all 1,809), and only three others still fail, each fixed by an open PR whose header changes the sync took in:Audio/SFX/SFXState/getSoundVolumeForFilename.cppandRendering/Bink/BinkControlClass/playBINK.cppneed theirchar const*definitions from Reimplement 5 UI::MenuViews functions at 100% #353;UI/MenuTextInputState/clearModalDialog2to6.cppneeds thepreviousModalDialogsloop from Reimplement 5 UI menu dialog, minimap and progress bar functions at 100% #348.With those three taken from their PRs for the measurement only, the DLL links, and all three functions here read 100.0% with sourcehold's reccmp (
--resolve-wrapped-calls --ignore-security-cookie, the struct resolvers enabled locally and not committed).status_regression.pyfinds nothing below a known score.The same kind of fix as #343 and #350.
Something for the next Ghidra sync
A full link of main also stops on two entries in
src/symbols/data.asm(they're generated, so this is yours):DAT_PerformanceCounterFrequency(0x00DF33E8) is declared asU_LARGE_INTEGER, a struct, but_LARGE_INTEGERis a union in the Windows headers, so the compiler asks forT_LARGE_INTEGER(TicksStartCounter.cpp, TicksSinceCounterStart.cpp);DPLAY_InterfacePointer(0x00DF3D18) is declared in adplaynamespace (PAUIDirectPlay4@dplay@@), butIDirectPlay4from dplay.h is in the global one (initializeDirectPlayAndCreateOrJoinSession.cpp).Both have been that way since the syncs of 2026-11-04 and 11-05. For the measurement I left those three files out of the build.
Other PRs: the ready #348, #349, #352, #353, #354, #357, #358, #359 and #364, and the drafts #313, #318, #321, #327, #328, #356, #360 and #363. Several of them will get main merged in for the same sync.
🤖 Generated with Claude Code