Skip to content

bugfix(ocl): Fix uninitialized variable in ObjectCreationList to avoid mismatches #2096

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

Open
Caball009 wants to merge 3 commits into
base: main
Choose a base branch
from
Open

bugfix(ocl): Fix uninitialized variable in ObjectCreationList to avoid mismatches #2096

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
8bf509a
bugfix(ocl): Fix uninitialized variable in ObjectCreationList to avoi…
Caball009 Jan 12, 2026
4b1dc5c
Removed branch for release build.
Caball009 Jan 23, 2026
6831933
Replicated in Generals.
Caball009 Jan 23, 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
16 changes: 14 additions & 2 deletions Generals/Code/GameEngine/Source/GameLogic/Object/ObjectCreationList.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1294,12 +1294,24 @@ class GenericObjectCreationNugget : public ObjectCreationNugget
// longer be necessary and can be taken out -- amit
if (m_spreadFormation)
{
Coord3D resultPos;
FindPositionOptions fpOptions;
fpOptions.minRadius = GameLogicRandomValueReal(m_minDistanceAFormation, m_minDistanceBFormation);
fpOptions.maxRadius = m_maxDistanceFormation;
fpOptions.flags = FPF_USE_HIGHEST_LAYER;
ThePartitionManager->findPositionAround(pos, &fpOptions, &resultPos);

// TheSuperHackers @bugfix Caball009 12/01/2026 Position variable needs to be initialized before use.
// The non-deterministic behavior for retail clients cannot be fixed, so this will remain a source of potential mismatches for unpatched clients.
// Fall back to the center position if no valid position was found, so that the behavior is deterministic for patched clients.
Coord3D resultPos = *pos;

if (!ThePartitionManager->findPositionAround(pos, &fpOptions, &resultPos))
{
DEBUG_ASSERTCRASH(resultPos == *pos, ("Position should not have been changed"));

#if RETAIL_COMPATIBLE_CRC
DEBUG_CRASH(("A mismatch is likely to happen if this code path is used in a match with unpatched clients."));
#endif
}
doStuffToObj( debris, m_names[pick], &resultPos, mtx, orientation, sourceObj, lifetimeFrames );
}
else
Expand Down
16 changes: 14 additions & 2 deletions GeneralsMD/Code/GameEngine/Source/GameLogic/Object/ObjectCreationList.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1382,12 +1382,24 @@ class GenericObjectCreationNugget : public ObjectCreationNugget
// longer be necessary and can be taken out -- amit
if (m_spreadFormation)
{
Coord3D resultPos;
FindPositionOptions fpOptions;
fpOptions.minRadius = GameLogicRandomValueReal(m_minDistanceAFormation, m_minDistanceBFormation);
fpOptions.maxRadius = m_maxDistanceFormation;
fpOptions.flags = FPF_USE_HIGHEST_LAYER;
ThePartitionManager->findPositionAround(pos, &fpOptions, &resultPos);

// TheSuperHackers @bugfix Caball009 12/01/2026 Position variable needs to be initialized before use.
// The non-deterministic behavior for retail clients cannot be fixed, so this will remain a source of potential mismatches for unpatched clients.
// Fall back to the center position if no valid position was found, so that the behavior is deterministic for patched clients.
Coord3D resultPos = *pos;

if (!ThePartitionManager->findPositionAround(pos, &fpOptions, &resultPos))
{
DEBUG_ASSERTCRASH(resultPos == *pos, ("Position should not have been changed"));

#if RETAIL_COMPATIBLE_CRC
DEBUG_CRASH(("A mismatch is likely to happen if this code path is used in a match with unpatched clients."));
#endif
}
doStuffToObj( debris, m_names[pick], &resultPos, mtx, orientation, sourceObj, lifetimeFrames );
}
else
Expand Down
Loading