bugfix: Make healed infantry follow the building rally point #1822
+20
−0
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Signed-off-by: tintinhamans <5984296+tintinhamans@users.noreply.github.com>
tintinhamans
added
Bug
Skyaero42
reviewed
Nov 11, 2025
| // 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 |
There was a problem hiding this comment.
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.
Skyaero42
reviewed
Nov 11, 2025
| if (buildingExit && buildingExit != static_cast<ExitInterface*>(this)) | ||
| { | ||
| const Coord3D* rp = buildingExit->getRallyPoint(); | ||
| if (rp) { setRallyPoint(rp); } |
There was a problem hiding this comment.
use
if (rp)
setRallyPoint(rp);if (rp)
{
setRallyPoint(rp);
}for readability
Skyaero42
reviewed
Nov 11, 2025
| const Coord3D* rp = buildingExit->getRallyPoint(); | ||
| if (rp) { setRallyPoint(rp); } | ||
| } | ||
| #endif |
Skyaero42
reviewed
Nov 11, 2025
| if( doneHealing == TRUE ) | ||
| { | ||
| // TheSuperHackers @bugfix arcticdolphin 07/11/2025 Copy building rally so healed infantry follow it | ||
| #if !RETAIL_COMPATIBLE_CRC |
Skyaero42
reviewed
Nov 11, 2025
| // 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)) |
There was a problem hiding this comment.
Is the self-check needed here?
Are there scenarios where getObject()->getObjectExitInterface() can return the same ExitInterface as the current unit?
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Infantry will now follow building rally point after healing.
Closes #221