Hri7566
/
sm64ex-coop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix first-person camera lock bug 

Getting kicked in vanilla-cam's first person messed up the camera, this
fixes it.
Fixes #55
This commit is contained in:
MysterD 2020-09-11 22:32:32 -07:00
parent 8ebd8e99fe
commit 8517419430
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/game/interaction.c
View File

@ -1263,6 +1263,12 @@ u32 interact_player(struct MarioState* m, UNUSED u32 interactType, struct Object
if (m2->playerIndex == 0) { if (m2->playerIndex == 0) {
m2->interactObj = m->marioObj; m2->interactObj = m->marioObj;
if (interaction & INT_KICK) { if (interaction & INT_KICK) {
if (m2->action == ACT_FIRST_PERSON) {
// without this branch, the player will be stuck in first person
raise_background_noise(2);
set_camera_mode(m2->area->camera, -1, 1);
m2->input &= ~INPUT_FIRST_PERSON;
}
set_mario_action(m2, ACT_FREEFALL, 0); set_mario_action(m2, ACT_FREEFALL, 0);
} }
m->marioObj->oDamageOrCoinValue = determine_player_damage_value(interaction); m->marioObj->oDamageOrCoinValue = determine_player_damage_value(interaction);