Skip to content

fix(logic): Improve validation of MSG_NEW_GAME in GameLogicDispatch #2440

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
xezon merged 3 commits into from
Mar 14, 2026
+24 −0
Merged

fix(logic): Improve validation of MSG_NEW_GAME in GameLogicDispatch #2440

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
551093f
fix(logic): Check that game is ready for MSG_NEW_GAME
stephanmeesters Mar 1, 2026
c18cddc
Improve comment
stephanmeesters Mar 12, 2026
b5d35b3
Replicate in Generals
stephanmeesters Mar 12, 2026
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
12 changes: 12 additions & 0 deletions Generals/Code/GameEngine/Source/GameLogic/System/GameLogicDispatch.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -410,6 +410,18 @@ void GameLogic::logicMessageDispatcher( GameMessage *msg, void *userData )
//---------------------------------------------------------------------------------------------
case GameMessage::MSG_NEW_GAME:
{
#if !RETAIL_COMPATIBLE_CRC
// TheSuperHackers @fix stephanmeesters 11/03/2026
// Make sure we're ready to start a new game. This prevents an issue where an infinite disconnect screen
// can be force-triggered in an online match by using cheats.
if ( isInGame() || isClearingGameData() || isLoadingMap() )
{
DEBUG_CRASH( ("Called MSG_NEW_GAME while game is not ready (inGame=%d, clearingData=%d, loadingMap=%d)",
isInGame(), isClearingGameData(), isLoadingMap()) );
break;
}
#endif

//DEBUG_ASSERTCRASH(msg->getArgumentCount() == 1 || msg->getArgumentCount() == 2, ("%d arguments to MSG_NEW_GAME", msg->getArgumentCount()));
GameMode gameMode = (GameMode)msg->getArgument( 0 )->integer;
Int rankPoints = 0;
Expand Down
12 changes: 12 additions & 0 deletions GeneralsMD/Code/GameEngine/Source/GameLogic/System/GameLogicDispatch.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -419,6 +419,18 @@ void GameLogic::logicMessageDispatcher( GameMessage *msg, void *userData )
//---------------------------------------------------------------------------------------------
case GameMessage::MSG_NEW_GAME:
{
#if !RETAIL_COMPATIBLE_CRC
// TheSuperHackers @fix stephanmeesters 11/03/2026
// Make sure we're ready to start a new game. This prevents an issue where an infinite disconnect screen
// can be force-triggered in an online match by using cheats.
if ( isInGame() || isClearingGameData() || isLoadingMap() )
{
DEBUG_CRASH( ("Called MSG_NEW_GAME while game is not ready (inGame=%d, clearingData=%d, loadingMap=%d)",
isInGame(), isClearingGameData(), isLoadingMap()) );
break;
}
#endif

//DEBUG_ASSERTCRASH(msg->getArgumentCount() == 1 || msg->getArgumentCount() == 2, ("%d arguments to MSG_NEW_GAME", msg->getArgumentCount()));
GameMode gameMode = (GameMode)msg->getArgument( 0 )->integer;
Int rankPoints = 0;
Expand Down
Loading