Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

tr2/lara/cheat: reset gun status if undrawing weapons #2380

Merged
merged 1 commit into from
Jan 25, 2025
Merged

tr2/lara/cheat: reset gun status if undrawing weapons #2380

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions docs/tr2/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@
- fixed Skidoo snow wake effects at slow speeds (#2324, regression from 0.6)
- fixed software renderer skybox occlusion issues (#2343, regression from 0.7)
- fixed gunflare from bandits in Tibetan levels spawning too far from their guns (#2365, regression from 0.8)
- fixed guns sometimes appearing in Lara's hands when entering the fly cheat while undrawing weapons (#2376, regression from 0.3)
- improved rendering to achieve a slight performance boost in big rooms (#2325)

## [0.8](https://github.com/LostArtefacts/TRX/compare/tr2-0.8...tr2-0.8) - 2025-01-01
Expand Down
3 changes: 2 additions & 1 deletion src/tr2/game/lara/cheat.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,8 @@ bool Lara_Cheat_EnterFlyMode(void)
M_ResetGunStatus();
}

if (g_Lara.gun_status == LGS_HANDS_BUSY) {
if (g_Lara.gun_status == LGS_HANDS_BUSY
|| (g_Lara.gun_status == LGS_UNDRAW && g_Lara.back_gun != O_LARA)) {
g_Lara.gun_status = LGS_ARMLESS;
}

Expand Down
Loading