Skip to content

Fix two files that stopped compiling after the e32319b21 header sync - #372

Merged
gynt merged 1 commit into
sourcehold:mainfrom
kotijekriv:fix/sync-e32319b21-renames
Nov 7, 2026
Merged

gynt merged 1 commit into
sourcehold:mainfrom
kotijekriv:fix/sync-e32319b21-renames

Conversation

@kotijekriv

@kotijekriv kotijekriv commented Nov 7, 2026 •

Copy link
Copy Markdown
Contributor

Main (e32319b) has two .cpp files that no longer compile in a clean build: the Ghidra sync e32319b renamed DAT_00b95954 to INT_00b95954 (and declared it int), and these files still include and name the old one. This PR moves them to main's name and changes nothing else: no header and no status line. Both functions stay at 100%, the same as their status lines. They're the only uses of the old name left on main.

File Was Main's name now
Audio/mss/SoundSystem/playDarMehqOrGlory.cpp DAT_00b95954 INT_00b95954
Game/GameCore/switchToMenuView.cpp DAT_00b95954 INT_00b95954

The include lines follow the name, sorted by clang-format.

Built with the bundled MSVC1400-SP1, natively on Windows, against the Steam Stronghold Crusader.exe (3bb0a8c1…5387ac5a). With this PR every .cpp under src/OpenSHC but three compiles and the DLL links; the merges of #348 and #353 brought back main's other files that the eef6f66 sync had broken. Both functions read 100.0% with sourcehold's reccmp (--resolve-wrapped-calls --ignore-security-cookie, the struct resolvers enabled locally and not committed), and status_regression.py finds nothing below a known score. The three left out are the ones the two data.asm entries described in #368 still keep from linking (TicksStartCounter, TicksSinceCounterStart, initializeDirectPlayAndCreateOrJoinSession).

The same kind of fix as #343, #350 and #368. Our open #369, whose header commit had typed this global, gets main merged in with the new name.

Other PRs: the ready #354, #369 and #370, and the drafts #313, #318, #321, #327, #328, #356, #360 and #363.

🤖 Generated with Claude Code

The Ghidra sync e32319b renamed DAT_00b95954 to INT_00b95954 (an int now). playDarMehqOrGlory and
switchToMenuView still included and named the old one; they move to main's name. No header or status line
changes.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
@gynt
gynt added this pull request to the merge queue Nov 7, 2026
Merged via the queue into sourcehold:main with commit efaa214 Nov 7, 2026
5 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants