tr1/objects/scion3: save scion hitpoints #1820
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: |
aredfan
approved these changes
Nov 3, 2024
rr-
reviewed
Nov 3, 2024
| @@ -12,6 +12,7 @@ void Scion3_Setup(OBJECT *obj) | |||
| obj->control = Scion3_Control; | |||
| obj->hit_points = 5; | |||
| obj->save_flags = 1; | |||
| obj->save_hitpoints = 1; | |||
There was a problem hiding this comment.
Oh no – we can't do it like this, or else it'll break legacy saves. We need to force disable saving the hitpoints in the legacy reader.
Should be easy to test – just grab a TombATI save from that level, try to load it with TRX containing the fix from this PR, and it shouldn't crash.
There was a problem hiding this comment.
Good catch, thanks!
Pushed a fix, and test saves attached. This loads OK (and can confirm it certainly did crash before fixing this).
lahm86
force-pushed
the
issue-1819-save-scion-hp
branch
from
874ef8c to
5f230c1
Compare
This ensures the shootable scion's hitpoints value is saved so if it's still active on reload, Lara can't continue to target it. Resolves LostArtefacts#1819.
lahm86
force-pushed
the
issue-1819-save-scion-hp
branch
from
5f230c1 to
d72d14d
Compare
aredfan
approved these changes
Nov 3, 2024
rr-
approved these changes
Nov 3, 2024
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 #1819.
Checklist
Description
This ensures the shootable scion's hitpoints value is saved so if it's still active on reload, Lara can't continue to target it.
Existing saves would continue to have this bug, so it's a going-forward fix.