Skip to content

bugfix(replay): Fix unrecognized replay files in Generals #1815

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 1 commit into from
Nov 7, 2025
Merged

bugfix(replay): Fix unrecognized replay files in Generals #1815

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
27 changes: 20 additions & 7 deletions Generals/Code/GameEngine/Source/GameNetwork/GameInfo.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1023,8 +1023,15 @@ Bool ParseAsciiStringToGameInfo(GameInfo *game, AsciiString options)
Money startingCash = TheGlobalData->m_defaultStartingCash;
UnsignedShort restriction = 0; // Always the default

Bool sawMap, sawMapCRC, sawMapSize, sawSeed, sawSlotlist, sawUseStats, sawSuperweaponRestriction, sawStartingCash, sawOldFactions;
sawMap = sawMapCRC = sawMapSize = sawSeed = sawSlotlist = sawUseStats = sawSuperweaponRestriction = sawStartingCash = sawOldFactions = FALSE;
Bool sawMap = FALSE;
Bool sawMapCRC = FALSE;
Bool sawMapSize = FALSE;
Bool sawSeed = FALSE;
Bool sawSlotlist = FALSE;
Bool sawUseStats = FALSE;
Bool sawSuperweaponRestriction = FALSE;
Bool sawStartingCash = FALSE;
Bool sawOldFactions = FALSE;

//DEBUG_LOG(("Saw options of %s", options.str()));
DEBUG_LOG(("ParseAsciiStringToGameInfo - parsing [%s]", options.str()));
Expand Down Expand Up @@ -1472,8 +1479,14 @@ Bool ParseAsciiStringToGameInfo(GameInfo *game, AsciiString options)

free(buf);

//DEBUG_LOG(("Options were ok == %d", optionsOk));
if (optionsOk && sawMap && sawMapCRC && sawMapSize && sawSeed && sawSlotlist && sawCRC && sawUseStats && sawSuperweaponRestriction && sawStartingCash && sawOldFactions )
// TheSuperHackers @tweak The following settings are no longer
// a strict requirement in the Zero Hour Replay file:
// * UseStats
// * SuperweaponRestriction
// * StartingCash
// * OldFactionsOnly
// In Generals they never were.
if (optionsOk && sawMap && sawMapCRC && sawMapSize && sawSeed && sawSlotlist && sawCRC)
{
// We were setting the Global Data directly here, but Instead, I'm now
// first setting the data in game. We'll set the global data when
Expand All @@ -1493,9 +1506,9 @@ Bool ParseAsciiStringToGameInfo(GameInfo *game, AsciiString options)
game->setSeed(seed);
game->setCRCInterval(crc);
game->setUseStats(useStats);
game->setSuperweaponRestriction(restriction);
game->setStartingCash( startingCash );
game->setOldFactionsOnly( oldFactionsOnly );
game->setSuperweaponRestriction(restriction);
game->setStartingCash(startingCash);
game->setOldFactionsOnly(oldFactionsOnly);

return true;
}
Expand Down
27 changes: 20 additions & 7 deletions GeneralsMD/Code/GameEngine/Source/GameNetwork/GameInfo.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1023,8 +1023,15 @@ Bool ParseAsciiStringToGameInfo(GameInfo *game, AsciiString options)
Money startingCash = TheGlobalData->m_defaultStartingCash;
UnsignedShort restriction = 0; // Always the default

Bool sawMap, sawMapCRC, sawMapSize, sawSeed, sawSlotlist, sawUseStats, sawSuperweaponRestriction, sawStartingCash, sawOldFactions;
sawMap = sawMapCRC = sawMapSize = sawSeed = sawSlotlist = sawUseStats = sawSuperweaponRestriction = sawStartingCash = sawOldFactions = FALSE;
Bool sawMap = FALSE;
Bool sawMapCRC = FALSE;
Bool sawMapSize = FALSE;
Bool sawSeed = FALSE;
Bool sawSlotlist = FALSE;
Bool sawUseStats = FALSE;
Bool sawSuperweaponRestriction = FALSE;
Bool sawStartingCash = FALSE;
Bool sawOldFactions = FALSE;

//DEBUG_LOG(("Saw options of %s", options.str()));
DEBUG_LOG(("ParseAsciiStringToGameInfo - parsing [%s]", options.str()));
Expand Down Expand Up @@ -1472,8 +1479,14 @@ Bool ParseAsciiStringToGameInfo(GameInfo *game, AsciiString options)

free(buf);

//DEBUG_LOG(("Options were ok == %d", optionsOk));
if (optionsOk && sawMap && sawMapCRC && sawMapSize && sawSeed && sawSlotlist && sawCRC && sawUseStats && sawSuperweaponRestriction && sawStartingCash && sawOldFactions )
// TheSuperHackers @tweak The following settings are no longer
// a strict requirement in the Zero Hour Replay file:
// * UseStats
// * SuperweaponRestriction
// * StartingCash
// * OldFactionsOnly
// In Generals they never were.
if (optionsOk && sawMap && sawMapCRC && sawMapSize && sawSeed && sawSlotlist && sawCRC)
{
// We were setting the Global Data directly here, but Instead, I'm now
// first setting the data in game. We'll set the global data when
Expand All @@ -1493,9 +1506,9 @@ Bool ParseAsciiStringToGameInfo(GameInfo *game, AsciiString options)
game->setSeed(seed);
game->setCRCInterval(crc);
game->setUseStats(useStats);
game->setSuperweaponRestriction(restriction);
game->setStartingCash( startingCash );
game->setOldFactionsOnly( oldFactionsOnly );
game->setSuperweaponRestriction(restriction);
game->setStartingCash(startingCash);
game->setOldFactionsOnly(oldFactionsOnly);

return true;
}
Expand Down
Loading