Skip to content

bugfix: Make healed infantry follow the building rally point #1822

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
wants to merge 1 commit into
base: main
Choose a base branch
from
+20 −0
Open

bugfix: Make healed infantry follow the building rally point #1822

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
10 changes: 10 additions & 0 deletions Generals/Code/GameEngine/Source/GameLogic/Object/Contain/HealContain.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,16 @@ UpdateSleepTime HealContain::update( void )
// if we're done healing, we need to remove us from the healing container
if( doneHealing == TRUE )
{
// TheSuperHackers @bugfix arcticdolphin 07/11/2025 Copy building rally so healed infantry follow it
Copy link

@Skyaero42 Skyaero42 Nov 11, 2025

Choose a reason for hiding this comment

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

I don't understand

Copy building rally so healed infantry follow it

The code is not a literal copy from somewhere.
Suggestion:

Move to rally point if present.

#if !RETAIL_COMPATIBLE_CRC
Copy link

@Skyaero42 Skyaero42 Nov 11, 2025

Choose a reason for hiding this comment

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

Remove indentation for #if

ExitInterface* buildingExit = getObject()->getObjectExitInterface();
if (buildingExit && buildingExit != static_cast<ExitInterface*>(this))
Copy link

@Skyaero42 Skyaero42 Nov 11, 2025

Choose a reason for hiding this comment

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

Is the self-check needed here?
Are there scenarios where getObject()->getObjectExitInterface() can return the same ExitInterface as the current unit?

{
const Coord3D* rp = buildingExit->getRallyPoint();
if (rp) { setRallyPoint(rp); }
Copy link

@Skyaero42 Skyaero42 Nov 11, 2025

Choose a reason for hiding this comment

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

use

if (rp)
    setRallyPoint(rp);
if (rp)
{
    setRallyPoint(rp);
}

for readability

}
#endif
Copy link

@Skyaero42 Skyaero42 Nov 11, 2025

Choose a reason for hiding this comment

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

Remove indentation for #endif


ExitDoorType exitDoor = reserveDoorForExit(obj->getTemplate(), obj);
if (exitDoor != DOOR_NONE_AVAILABLE)
exitObjectViaDoor( obj, exitDoor );
Expand Down
10 changes: 10 additions & 0 deletions GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Contain/HealContain.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,16 @@ UpdateSleepTime HealContain::update( void )
// if we're done healing, we need to remove us from the healing container
if( doneHealing == TRUE )
{
// TheSuperHackers @bugfix arcticdolphin 07/11/2025 Copy building rally so healed infantry follow it
#if !RETAIL_COMPATIBLE_CRC
ExitInterface* buildingExit = getObject()->getObjectExitInterface();
if (buildingExit && buildingExit != static_cast<ExitInterface*>(this))
{
const Coord3D* rp = buildingExit->getRallyPoint();
if (rp) { setRallyPoint(rp); }
}
#endif

ExitDoorType exitDoor = reserveDoorForExit(obj->getTemplate(), obj);
if (exitDoor != DOOR_NONE_AVAILABLE)
exitObjectViaDoor( obj, exitDoor );
Expand Down
Loading