Skip to content

bugfix(ocl): Fix GLA Rebel Ambush units spawning in water/cliffs and dying immediately #1882

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
bobtista wants to merge 3 commits into
base: main
Choose a base branch
from
Open

bugfix(ocl): Fix GLA Rebel Ambush units spawning in water/cliffs and dying immediately #1882

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
532de2e
bugfix(ocl): Fix GLA Rebel Ambush units spawning in water/cliffs and …
bobtista Nov 19, 2025
c80b026
put behind retail compatible crc flag
bobtista Nov 19, 2025
80aff0d
fix(ocl): Add static_cast for FindPositionFlags bitwise OR
bobtista Nov 29, 2025
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
17 changes: 17 additions & 0 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 @@ -1394,8 +1394,25 @@ class GenericObjectCreationNugget : public ObjectCreationNugget
FindPositionOptions fpOptions;
fpOptions.minRadius = GameLogicRandomValueReal(m_minDistanceAFormation, m_minDistanceBFormation);
fpOptions.maxRadius = m_maxDistanceFormation;
#if !RETAIL_COMPATIBLE_CRC
// TheSuperHackers @bugfix bobtista 18/11/2025 Use FPF_CLEAR_CELLS_ONLY when DiesOnBadLand to prevent spawning in water/cliffs
if (m_diesOnBadLand)
{
fpOptions.flags = static_cast<FindPositionFlags>(FPF_USE_HIGHEST_LAYER | FPF_CLEAR_CELLS_ONLY);
}
else
{
fpOptions.flags = FPF_USE_HIGHEST_LAYER;
}
// TheSuperHackers @bugfix bobtista 18/11/2025 Fall back to center if no passable position found in spread formation
Copy link

@Caball009 Caball009 Nov 29, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe it'd be better to combine both comments given their proximity.

Could be something like:

// TheSuperHackers @bugfix bobtista 18/11/2025 Spawn the object on passable terrain if it would be destroyed on impassable terrain (water / cliffs). 
// Use the original spawn position if no passable terrain was found in spread formation.

if (!ThePartitionManager->findPositionAround(pos, &fpOptions, &resultPos))
{
resultPos = *pos;
Copy link

@Caball009 Caball009 Nov 29, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Was this branch ever taken in your testing?

Copy link
Author

@bobtista bobtista Nov 30, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I didn't set a breaktpoint to check, I just played a game against an easy computer with water and mountains and eventually did rebel ambushes on the water and mountains to see if anyone died.

}
#else
fpOptions.flags = FPF_USE_HIGHEST_LAYER;
ThePartitionManager->findPositionAround(pos, &fpOptions, &resultPos);
#endif
doStuffToObj( debris, m_names[pick], &resultPos, mtx, orientation, sourceObj, lifetimeFrames );
}
else
Expand Down
Loading