tr1/lara/cheat: reset meshes in fly cheat #2571
Conversation
lahm86
requested review from
rr-,
walkawayy and
aredfan
and removed request for
a team
|
Download the built assets for this pull request: |
|
Everything looks good, thank you. 👍 I did find a bug with Lara holding a shotgun in one hand, but I don't think it's related to this PR as it's already on develop, will raise an issue shortly. |
Resolves LostArtefacts#2565. Resolves LostArtefacts#2572.
lahm86
force-pushed
the
issue-2565-cheat-meshes
branch
from
d6b2cf3 to
8d20aab
Compare
lahm86
changed the title
Thanks, should be addressed. Easiest just to do it here as it's all so related. |
| Gun_SetLaraHolsterLMesh(holsters_gun_type); | ||
| Gun_SetLaraHolsterRMesh(holsters_gun_type); | ||
| } | ||
| } |
There was a problem hiding this comment.
This logic is duplicated from somewhere isn't it? I think Lara_InitialiseMeshes. Any chance we can avoid duplication?
There was a problem hiding this comment.
Yeah, Lara_InitialiseMeshes uses RESUME_INFO though, so doesn't take into account guns she currently has, plus it results in the original bug with #2461. Maybe we could change the signature though.
WDYT about getting rid of |
This will make adding a potential option to change costumes at runtime more difficult; can we use a hybrid solution? |
Resolves #2565.
Resolves #2572.
Checklist
Description
This restores Lara's meshes if she is resurrected with the fly cheat. The only scenario we can't efficiently cover is the following:
In this case the holstered guns will be pistols because we don't store the last holstered gun type, and looking it up would involve a lot of mesh comparison which I don't feel is worth it, plus for things like the T-Rex and Midas deaths, the information is lost anyway. If the last gun is not the shotgun, the correct holster meshes will be restored normally.
Otherwise, other scenarios should hopefully work as expected 🤞 Worth checking #2461 too.