Skip to content

Commit 802036d

Browse files
committed
Synced with Generals
1 parent b89b612 commit 802036d

File tree

2 files changed

+11
-17
lines changed

2 files changed

+11
-17
lines changed

Generals/Code/GameEngine/Source/Common/Recorder.cpp

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1133,18 +1133,16 @@ Bool RecorderClass::replayMatchesGameVersion(AsciiString filename)
11331133

11341134
Bool RecorderClass::replayMatchesGameVersion(const ReplayHeader& header)
11351135
{
1136-
Bool versionStringDiff = header.versionString != TheVersion->getUnicodeVersion();
1137-
Bool versionTimeStringDiff = header.versionTimeString != TheVersion->getUnicodeBuildTime();
1138-
Bool versionNumberDiff = header.versionNumber != TheVersion->getVersionNumber();
1139-
Bool exeCRCDiff = header.exeCRC != TheGlobalData->m_exeCRC;
1140-
Bool exeDifferent = versionStringDiff || versionTimeStringDiff || versionNumberDiff || exeCRCDiff;
1141-
Bool iniDifferent = header.iniCRC != TheGlobalData->m_iniCRC;
1142-
1143-
if(exeDifferent || iniDifferent)
1144-
{
1145-
return FALSE;
1146-
}
1147-
return TRUE;
1136+
// 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.
1137+
if (header.versionString != TheVersion->getUnicodeVersion())
1138+
return false;
1139+
if (header.versionNumber != TheVersion->getVersionNumber())
1140+
return false;
1141+
if (header.exeCRC != TheGlobalData->m_exeCRC)
1142+
return false;
1143+
if (header.iniCRC != TheGlobalData->m_iniCRC)
1144+
return false;
1145+
return true;
11481146
}
11491147

11501148
/**

Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/ReplayMenu.cpp

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -274,11 +274,7 @@ void PopulateReplayFileListbox(GameWindow *listbox)
274274

275275
const Bool hasMap = mapData != NULL;
276276

277-
const Bool isCrcCompatible =
278-
header.versionString == TheVersion->getUnicodeVersion()
279-
&& header.versionNumber == TheVersion->getVersionNumber()
280-
&& header.exeCRC == TheGlobalData->m_exeCRC
281-
&& header.iniCRC == TheGlobalData->m_iniCRC;
277+
const Bool isCrcCompatible = RecorderClass::replayMatchesGameVersion(header);
282278

283279
if (isCrcCompatible)
284280
{

0 commit comments

Comments
 (0)