[GEN][ZH] Fix logical errors with RecorderClass::testVersionPlayback() (#989)

xezon · web-flow · commit 42d5c3a3c3d5 · 2025-06-01T15:44:49.000+02:00
diff --git a/Generals/Code/GameEngine/Include/Common/Recorder.h b/Generals/Code/GameEngine/Include/Common/Recorder.h
@@ -54,6 +54,9 @@ enum RecorderModeType CPP_11(: Int) {
 class CRCInfo;
 
 class RecorderClass : public SubsystemInterface {
+public:
+	struct ReplayHeader;
+
 public:
 	RecorderClass();																	///< Constructor.
 	virtual ~RecorderClass();													///< Destructor.
@@ -68,7 +71,8 @@ class RecorderClass : public SubsystemInterface {
 	// Methods dealing with playback.
 	void updatePlayback();														///< The update function for playing back a file.
 	Bool playbackFile(AsciiString filename);					///< Starts playback of the specified file.
-	Bool testVersionPlayback(AsciiString filename);   ///< Returns if the playback is a valid playback file for this version or not.
+	Bool replayMatchesGameVersion(AsciiString filename); ///< Returns true if the playback is a valid playback file for this version.
+	static Bool replayMatchesGameVersion(const ReplayHeader& header); ///< Returns true if the playback is a valid playback file for this version.
 	AsciiString getCurrentReplayFilename( void );			///< valid during playback only
 	void stopPlayback();															///< Stops playback.  Its fine to call this even if not playing back a file.
 #if defined RTS_DEBUG || defined RTS_INTERNAL
diff --git a/Generals/Code/GameEngine/Source/Common/Recorder.cpp b/Generals/Code/GameEngine/Source/Common/Recorder.cpp
@@ -1064,19 +1064,22 @@ void RecorderClass::handleCRCMessage(UnsignedInt newCRC, Int playerIndex, Bool f
 }
 
 /**
- * Return true if this version of the file is the same as our version of the game
+ * Returns true if this version of the file is the same as our version of the game
  */
-Bool RecorderClass::testVersionPlayback(AsciiString filename)
+Bool RecorderClass::replayMatchesGameVersion(AsciiString filename)
 {
-
 	ReplayHeader header;
 	header.forPlayback = TRUE;
 	header.filename = filename;
-	Bool success = readReplayHeader( header );
-	if (!success)
+	if ( readReplayHeader( header ) )
 	{
-		return FALSE;
+		return replayMatchesGameVersion( header );
 	}
+	return FALSE;
+}
+
+Bool RecorderClass::replayMatchesGameVersion(const ReplayHeader& header)
+{
 	Bool versionStringDiff = header.versionString != TheVersion->getUnicodeVersion();
 	Bool versionTimeStringDiff = header.versionTimeString != TheVersion->getUnicodeBuildTime();
 	Bool versionNumberDiff = header.versionNumber != TheVersion->getVersionNumber();
@@ -1086,10 +1089,9 @@ Bool RecorderClass::testVersionPlayback(AsciiString filename)
 
 	if(exeDifferent || iniDifferent)
 	{
-		return TRUE;
+		return FALSE;
 	}
-	return FALSE;
-
+	return TRUE;
 }
 
 /**
diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/ReplayMenu.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/ReplayMenu.cpp
@@ -449,7 +449,7 @@ static void loadReplay(UnicodeString filename)
 	AsciiString asciiFilename;
 	asciiFilename.translate(filename);
 
-	if(TheRecorder->testVersionPlayback(asciiFilename))
+	if(!TheRecorder->replayMatchesGameVersion(asciiFilename))
 	{
 		MessageBoxOkCancel(TheGameText->fetch("GUI:OlderReplayVersionTitle"), TheGameText->fetch("GUI:OlderReplayVersion"), reallyLoadReplay, NULL);
 	}
diff --git a/GeneralsMD/Code/GameEngine/Include/Common/Recorder.h b/GeneralsMD/Code/GameEngine/Include/Common/Recorder.h
@@ -54,6 +54,9 @@ enum RecorderModeType CPP_11(: Int) {
 class CRCInfo;
 
 class RecorderClass : public SubsystemInterface {
+public:
+	struct ReplayHeader;
+
 public:
 	RecorderClass();																	///< Constructor.
 	virtual ~RecorderClass();													///< Destructor.
@@ -68,7 +71,8 @@ class RecorderClass : public SubsystemInterface {
 	// Methods dealing with playback.
 	void updatePlayback();														///< The update function for playing back a file.
 	Bool playbackFile(AsciiString filename);					///< Starts playback of the specified file.
-	Bool testVersionPlayback(AsciiString filename);   ///< Returns if the playback is a valid playback file for this version or not.
+	Bool replayMatchesGameVersion(AsciiString filename); ///< Returns true if the playback is a valid playback file for this version.
+	static Bool replayMatchesGameVersion(const ReplayHeader& header); ///< Returns true if the playback is a valid playback file for this version.
 	AsciiString getCurrentReplayFilename( void );			///< valid during playback only
 	void stopPlayback();															///< Stops playback.  Its fine to call this even if not playing back a file.
 #if defined RTS_DEBUG || defined RTS_INTERNAL
diff --git a/GeneralsMD/Code/GameEngine/Source/Common/Recorder.cpp b/GeneralsMD/Code/GameEngine/Source/Common/Recorder.cpp
@@ -1067,19 +1067,22 @@ void RecorderClass::handleCRCMessage(UnsignedInt newCRC, Int playerIndex, Bool f
 }
 
 /**
- * Return true if this version of the file is the same as our version of the game
+ * Returns true if this version of the file is the same as our version of the game
  */
-Bool RecorderClass::testVersionPlayback(AsciiString filename)
+Bool RecorderClass::replayMatchesGameVersion(AsciiString filename)
 {
-
 	ReplayHeader header;
 	header.forPlayback = TRUE;
 	header.filename = filename;
-	Bool success = readReplayHeader( header );
-	if (!success)
+	if ( readReplayHeader( header ) )
 	{
-		return FALSE;
+		return replayMatchesGameVersion( header );
 	}
+	return FALSE;
+}
+
+Bool RecorderClass::replayMatchesGameVersion(const ReplayHeader& header)
+{
 	Bool versionStringDiff = header.versionString != TheVersion->getUnicodeVersion();
 	Bool versionTimeStringDiff = header.versionTimeString != TheVersion->getUnicodeBuildTime();
 	Bool versionNumberDiff = header.versionNumber != TheVersion->getVersionNumber();
@@ -1089,10 +1092,9 @@ Bool RecorderClass::testVersionPlayback(AsciiString filename)
 
 	if(exeDifferent || iniDifferent)
 	{
-		return TRUE;
+		return FALSE;
 	}
-	return FALSE;
-
+	return TRUE;
 }
 
 /**
diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/ReplayMenu.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/ReplayMenu.cpp
@@ -449,7 +449,7 @@ static void loadReplay(UnicodeString filename)
 	AsciiString asciiFilename;
 	asciiFilename.translate(filename);
 
-	if(TheRecorder->testVersionPlayback(asciiFilename))
+	if(!TheRecorder->replayMatchesGameVersion(asciiFilename))
 	{
 		MessageBoxOkCancel(TheGameText->fetch("GUI:OlderReplayVersionTitle"), TheGameText->fetch("GUI:OlderReplayVersion"), reallyLoadReplay, NULL);
 	}

Original file line number	Diff line number	Diff line change
`@@ -1064,19 +1064,22 @@ void RecorderClass::handleCRCMessage(UnsignedInt newCRC, Int playerIndex, Bool f`
`1064`	`1064`	`}`
`1065`	`1065`
`1066`	`1066`	`/**`
`1067`		`- * Return true if this version of the file is the same as our version of the game`
	`1067`	`+ * Returns true if this version of the file is the same as our version of the game`
`1068`	`1068`	`*/`
`1069`		`-Bool RecorderClass::testVersionPlayback(AsciiString filename)`
	`1069`	`+Bool RecorderClass::replayMatchesGameVersion(AsciiString filename)`
`1070`	`1070`	`{`
`1071`		`-`
`1072`	`1071`	`ReplayHeader header;`
`1073`	`1072`	`header.forPlayback = TRUE;`
`1074`	`1073`	`header.filename = filename;`
`1075`		`- Bool success = readReplayHeader( header );`
`1076`		`- if (!success)`
	`1074`	`+ if ( readReplayHeader( header ) )`
`1077`	`1075`	`{`
`1078`		`- return FALSE;`
	`1076`	`+ return replayMatchesGameVersion( header );`
`1079`	`1077`	`}`
	`1078`	`+ return FALSE;`
	`1079`	`+}`
	`1080`	`+`
	`1081`	`+Bool RecorderClass::replayMatchesGameVersion(const ReplayHeader& header)`
	`1082`	`+{`
`1080`	`1083`	`Bool versionStringDiff = header.versionString != TheVersion->getUnicodeVersion();`
`1081`	`1084`	`Bool versionTimeStringDiff = header.versionTimeString != TheVersion->getUnicodeBuildTime();`
`1082`	`1085`	`Bool versionNumberDiff = header.versionNumber != TheVersion->getVersionNumber();`
`@@ -1086,10 +1089,9 @@ Bool RecorderClass::testVersionPlayback(AsciiString filename)`
`1086`	`1089`
`1087`	`1090`	`if(exeDifferent \|\| iniDifferent)`
`1088`	`1091`	`{`
`1089`		`- return TRUE;`
	`1092`	`+ return FALSE;`
`1090`	`1093`	`}`
`1091`		`- return FALSE;`
`1092`		`-`
	`1094`	`+ return TRUE;`
`1093`	`1095`	`}`
`1094`	`1096`
`1095`	`1097`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -449,7 +449,7 @@ static void loadReplay(UnicodeString filename)`
`449`	`449`	`AsciiString asciiFilename;`
`450`	`450`	`asciiFilename.translate(filename);`
`451`	`451`
`452`		`- if(TheRecorder->testVersionPlayback(asciiFilename))`
	`452`	`+ if(!TheRecorder->replayMatchesGameVersion(asciiFilename))`
`453`	`453`	`{`
`454`	`454`	`MessageBoxOkCancel(TheGameText->fetch("GUI:OlderReplayVersionTitle"), TheGameText->fetch("GUI:OlderReplayVersion"), reallyLoadReplay, NULL);`
`455`	`455`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1067,19 +1067,22 @@ void RecorderClass::handleCRCMessage(UnsignedInt newCRC, Int playerIndex, Bool f`
`1067`	`1067`	`}`
`1068`	`1068`
`1069`	`1069`	`/**`
`1070`		`- * Return true if this version of the file is the same as our version of the game`
	`1070`	`+ * Returns true if this version of the file is the same as our version of the game`
`1071`	`1071`	`*/`
`1072`		`-Bool RecorderClass::testVersionPlayback(AsciiString filename)`
	`1072`	`+Bool RecorderClass::replayMatchesGameVersion(AsciiString filename)`
`1073`	`1073`	`{`
`1074`		`-`
`1075`	`1074`	`ReplayHeader header;`
`1076`	`1075`	`header.forPlayback = TRUE;`
`1077`	`1076`	`header.filename = filename;`
`1078`		`- Bool success = readReplayHeader( header );`
`1079`		`- if (!success)`
	`1077`	`+ if ( readReplayHeader( header ) )`
`1080`	`1078`	`{`
`1081`		`- return FALSE;`
	`1079`	`+ return replayMatchesGameVersion( header );`
`1082`	`1080`	`}`
	`1081`	`+ return FALSE;`
	`1082`	`+}`
	`1083`	`+`
	`1084`	`+Bool RecorderClass::replayMatchesGameVersion(const ReplayHeader& header)`
	`1085`	`+{`
`1083`	`1086`	`Bool versionStringDiff = header.versionString != TheVersion->getUnicodeVersion();`
`1084`	`1087`	`Bool versionTimeStringDiff = header.versionTimeString != TheVersion->getUnicodeBuildTime();`
`1085`	`1088`	`Bool versionNumberDiff = header.versionNumber != TheVersion->getVersionNumber();`
`@@ -1089,10 +1092,9 @@ Bool RecorderClass::testVersionPlayback(AsciiString filename)`
`1089`	`1092`
`1090`	`1093`	`if(exeDifferent \|\| iniDifferent)`
`1091`	`1094`	`{`
`1092`		`- return TRUE;`
	`1095`	`+ return FALSE;`
`1093`	`1096`	`}`
`1094`		`- return FALSE;`
`1095`		`-`
	`1097`	`+ return TRUE;`
`1096`	`1098`	`}`
`1097`	`1099`
`1098`	`1100`	`/**`