Hri7566
/
sm64coopdx
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix bettercam zoom & pan level affecting main menu (#221)

This commit is contained in:
Mechstreme 2024-07-21 19:56:09 -03:00 committed by GitHub
parent b78c438871
commit 73e9dd2c40
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/game/bettercamera.inc.h
View File

@ -406,6 +406,12 @@ static void newcam_rotate_button(void) {
} }
static void newcam_zoom_button(void) { static void newcam_zoom_button(void) {
if (gDjuiInMainMenu) {
newcam_distance = 750;
newcam_distance_target = 750;
return;
}
//Smoothly move the camera to the new spot. //Smoothly move the camera to the new spot.
if (newcam_distance > newcam_distance_target) { if (newcam_distance > newcam_distance_target) {
newcam_distance -= 250; newcam_distance -= 250;
@ -623,6 +629,12 @@ static void newcam_collision(void) {
} }
static void newcam_set_pan(void) { static void newcam_set_pan(void) {
if (gDjuiInMainMenu) {
newcam_pan_x = 0;
newcam_pan_z = 0;
return;
}
//Apply panning values based on Mario's direction. //Apply panning values based on Mario's direction.
if (gMarioStates[0].action != ACT_HOLDING_BOWSER && gMarioStates[0].action != ACT_SLEEPING && gMarioStates[0].action != ACT_START_SLEEPING) { if (gMarioStates[0].action != ACT_HOLDING_BOWSER && gMarioStates[0].action != ACT_SLEEPING && gMarioStates[0].action != ACT_START_SLEEPING) {
approach_f32_asymptotic_bool(&newcam_pan_x, lengthdir_x((160*newcam_panlevel)/100, -gMarioStates[0].faceAngle[1]-0x4000), 0.05); approach_f32_asymptotic_bool(&newcam_pan_x, lengthdir_x((160*newcam_panlevel)/100, -gMarioStates[0].faceAngle[1]-0x4000), 0.05);