tr1/objects/bear: apply AI fix in bear control #2562
Merged
Conversation
This file contains 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
lahm86
requested review from
rr-,
walkawayy and
aredfan
and removed request for
a team
|
Download the built assets for this pull request: |
lahm86
force-pushed
the
issue-2559-fix-demo-bear-ai
branch
from
d5c73eb to
5ec38d9
Compare
rr-
reviewed
Feb 27, 2025
lahm86
force-pushed
the
issue-2559-fix-demo-bear-ai
branch
from
5ec38d9 to
bc5067b
Compare
rr-
approved these changes
Feb 27, 2025
| @@ -76,6 +71,8 @@ static void M_Setup(OBJECT *const obj) | |||
|
|
|||
| static void M_Control(const int16_t item_num) | |||
| { | |||
| OBJECT *const obj = Object_Get(O_BEAR); | |||
There was a problem hiding this comment.
One last nitpick - can we use item->object_id?
There was a problem hiding this comment.
Of course, my bad. I was a bit hasty with this 😄
This moves the bear AI fix to the control routine to avoid the setting having been changed before demos load, where the setting will be disabled. Resolves LostArtefacts#2559.
lahm86
force-pushed
the
issue-2559-fix-demo-bear-ai
branch
from
bc5067b to
0298b08
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Resolves #2559.
Checklist
Description
This moves the bear AI fix to the control routine as otherwise when the demo alters the setting, its effect has already taken place in the bear setup function. It's not ideal calling it on every frame a bear is active, but I suppose a benefit is that it does allow changing the setting in-game with the console without having to reload.