This repository has been archived by the owner on Oct 4, 2024. It is now read-only.
lara_cheat: amend teleporting approach #223
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
This changes the animation reset to only occur if Lara is in an extra animation, therefore allowing any other regular in-game animations to complete normally after teleporting. Resolves LostArtefacts#222.
lahm86
force-pushed
the
issue-222-tp-reset
branch
from
d9285bf
to
bb0d365
Compare
rr-
reviewed
Sep 9, 2024
src/game/lara/lara_cheat.c
Outdated
| } | ||
| g_Lara.extra_anim = 0; | ||
| const bool has_flare = Lara_Cheat_HasFlare(); | ||
| Lara_Cheat_ReinitialiseGunMeshes(has_flare); |
There was a problem hiding this comment.
Thanks. I wonder if there's any way to simplify this logic?
There was a problem hiding this comment.
I've tidied it up, checking the flare state multiple times didn't make sense, as it's only needed just before Lara_InitialiseMeshes is called, as that's what resets it. Once we know more about flares we can hopefully eliminate it.
rr-
approved these changes
Sep 9, 2024
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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 #222.
This changes the animation reset to only occur if Lara is in an extra animation, therefore allowing any other regular in-game animations to complete normally after teleporting. This means that when in the Rig or HSH starting anim, for example, Lara will "reset" to standing still or being underwater. For other situations, whatever she is doing at the point of teleporting, she will complete the animation in her new position, and so it's more in-line with TR1X.
I think this is safer as there could be so many edge cases of checking what she is doing and working out how to reset it, and at which point to do so, such as when her arm is going from backpack to regular position.
The death we were seeing before when trying this approach in Rig isn't present - there must have been something going on with the extra anim whereby it requires the full reset.