Skip to content

bugfix(gui): Fix incorrect Replay incompatibility messages #1745

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Nov 3, 2025
Merged

bugfix(gui): Fix incorrect Replay incompatibility messages #1745

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
c994c6f
Simplify RecorderClass::replayMatchesGameVersion a bit
helmutbuhler Oct 25, 2025
1d97452
Don't compare versionTimeString in RecorderClass::replayMatchesGameVe…
helmutbuhler Oct 25, 2025
b7d7c1a
Simplify isCrcCompatible calculation in ReplayMenu
helmutbuhler Oct 25, 2025
ed32979
Remove commented code
helmutbuhler Nov 3, 2025
b89b612
Add comment
helmutbuhler Nov 3, 2025
802036d
Synced with Generals
helmutbuhler Nov 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 10 additions & 12 deletions Generals/Code/GameEngine/Source/Common/Recorder.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1133,18 +1133,16 @@ Bool RecorderClass::replayMatchesGameVersion(AsciiString filename)

Bool RecorderClass::replayMatchesGameVersion(const ReplayHeader& header)
{
Bool versionStringDiff = header.versionString != TheVersion->getUnicodeVersion();
Bool versionTimeStringDiff = header.versionTimeString != TheVersion->getUnicodeBuildTime();
Bool versionNumberDiff = header.versionNumber != TheVersion->getVersionNumber();
Bool exeCRCDiff = header.exeCRC != TheGlobalData->m_exeCRC;
Bool exeDifferent = versionStringDiff || versionTimeStringDiff || versionNumberDiff || exeCRCDiff;
Bool iniDifferent = header.iniCRC != TheGlobalData->m_iniCRC;

if(exeDifferent || iniDifferent)
{
return FALSE;
}
return TRUE;
// TheSuperHackers @fix No longer checks the build time here to prevent incorrect Replay playback incompatibility messages when the Replay playback would actually be technically compatible.
if (header.versionString != TheVersion->getUnicodeVersion())
return false;
if (header.versionNumber != TheVersion->getVersionNumber())
return false;
if (header.exeCRC != TheGlobalData->m_exeCRC)
return false;
if (header.iniCRC != TheGlobalData->m_iniCRC)
return false;
return true;
}

/**
Expand Down
6 changes: 1 addition & 5 deletions Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/ReplayMenu.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -274,11 +274,7 @@ void PopulateReplayFileListbox(GameWindow *listbox)

const Bool hasMap = mapData != NULL;

const Bool isCrcCompatible =
header.versionString == TheVersion->getUnicodeVersion()
&& header.versionNumber == TheVersion->getVersionNumber()
&& header.exeCRC == TheGlobalData->m_exeCRC
&& header.iniCRC == TheGlobalData->m_iniCRC;
const Bool isCrcCompatible = RecorderClass::replayMatchesGameVersion(header);

if (isCrcCompatible)
{
Expand Down
22 changes: 10 additions & 12 deletions GeneralsMD/Code/GameEngine/Source/Common/Recorder.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1136,18 +1136,16 @@ Bool RecorderClass::replayMatchesGameVersion(AsciiString filename)

Bool RecorderClass::replayMatchesGameVersion(const ReplayHeader& header)
{
Bool versionStringDiff = header.versionString != TheVersion->getUnicodeVersion();
Bool versionTimeStringDiff = header.versionTimeString != TheVersion->getUnicodeBuildTime();
Bool versionNumberDiff = header.versionNumber != TheVersion->getVersionNumber();
Bool exeCRCDiff = header.exeCRC != TheGlobalData->m_exeCRC;
Bool exeDifferent = versionStringDiff || versionTimeStringDiff || versionNumberDiff || exeCRCDiff;
Bool iniDifferent = header.iniCRC != TheGlobalData->m_iniCRC;

if(exeDifferent || iniDifferent)
{
return FALSE;
}
return TRUE;
// TheSuperHackers @fix No longer checks the build time here to prevent incorrect Replay playback incompatibility messages when the Replay playback would actually be technically compatible.
if (header.versionString != TheVersion->getUnicodeVersion())
return false;
if (header.versionNumber != TheVersion->getVersionNumber())
return false;
if (header.exeCRC != TheGlobalData->m_exeCRC)
return false;
if (header.iniCRC != TheGlobalData->m_iniCRC)
return false;
return true;
}

/**
Expand Down
6 changes: 1 addition & 5 deletions GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/ReplayMenu.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -274,11 +274,7 @@ void PopulateReplayFileListbox(GameWindow *listbox)

const Bool hasMap = mapData != NULL;

const Bool isCrcCompatible =
header.versionString == TheVersion->getUnicodeVersion()
&& header.versionNumber == TheVersion->getVersionNumber()
&& header.exeCRC == TheGlobalData->m_exeCRC
&& header.iniCRC == TheGlobalData->m_iniCRC;
const Bool isCrcCompatible = RecorderClass::replayMatchesGameVersion(header);

if (isCrcCompatible)
{
Expand Down
Loading