bugfix: Enter commands are now ignored if the target to enter is invalid or ourselves - #3115
Open
Stubbjax wants to merge 1 commit into
Open
bugfix: Enter commands are now ignored if the target to enter is invalid or ourselves#3115Stubbjax wants to merge 1 commit into
Stubbjax wants to merge 1 commit into
Conversation
xezon
reviewed
Aug 12, 2026
| #endif | ||
|
|
||
| #if !RETAIL_COMPATIBLE_CRC | ||
| // Ignore the command if we are told to enter ourselves (we can be in the same group). |
| return; | ||
|
|
||
| // Ignore the command if we are told to enter something we cannot (we can be in the same group). | ||
| if (parms->m_cmd == AICMD_ENTER && !TheActionManager->canEnterObject(getObject(), parms->m_obj, parms->m_cmdSource, DONT_CHECK_CAPACITY)) |
There was a problem hiding this comment.
Can merge the parms->m_cmd == AICMD_ENTER condition into one.
Caball009
reviewed
Aug 12, 2026
Comment on lines
+1299
to
+1308
| #if !RETAIL_COMPATIBLE_CRC | ||
| // Ignore the command if we are told to enter ourselves (we can be in the same group). | ||
| if (parms->m_cmd == AICMD_ENTER && parms->m_obj && parms->m_obj->getID() == getObject()->getID()) | ||
| return; | ||
|
|
||
| // Ignore the command if we are told to enter something we cannot (we can be in the same group). | ||
| if (parms->m_cmd == AICMD_ENTER && !TheActionManager->canEnterObject(getObject(), parms->m_obj, parms->m_cmdSource, DONT_CHECK_CAPACITY)) | ||
| return; | ||
| #endif | ||
|
|
There was a problem hiding this comment.
Is it possible to put this in a case for AICMD_ENTER in the switch statement below?
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 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.
This change fixes an issue where grounded Chinooks would take off when receiving invalid enter commands.
Before
When the Chinook is in the selection, an enter command causes it to lift off
BEFORE.mp4
BEFORE.mp4
After
When the Chinook is in the selection, an enter command no longer causes it to lift off
AFTER.mp4
AFTER.mp4