From 6e936174b0b8145087e6470ea0a71c9c5baa2d66 Mon Sep 17 00:00:00 2001 From: Colton Rushton Date: Wed, 20 May 2020 16:52:52 -0300 Subject: [PATCH] Resolve a few errors with the new additions. --- src/game/bettercamera.inc.h | 4 ++-- src/game/camera.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/game/bettercamera.inc.h b/src/game/bettercamera.inc.h index 6f3decbf..81ec9d07 100644 --- a/src/game/bettercamera.inc.h +++ b/src/game/bettercamera.inc.h @@ -187,7 +187,7 @@ void newcam_diagnostics(void) print_text_fmt_int(32,32,"DISTANCE %d",newcam_distance); } -static s16 newcam_adjust_value(s16 var, s16 val) +static s16 newcam_adjust_value(s16 var, s16 val, s8 max) { if (val > 0) { @@ -337,7 +337,7 @@ static void newcam_rotate_button(void) if (newcam_modeflags & NC_FLAG_8D) { if (newcam_cstick_down == 0) - { + { newcam_cstick_down = 1; newcam_centering = 1; #ifndef nosound diff --git a/src/game/camera.c b/src/game/camera.c index e337c815..5ae68805 100644 --- a/src/game/camera.c +++ b/src/game/camera.c @@ -3083,8 +3083,8 @@ void update_camera(struct Camera *c) { if (gMarioState->action == ACT_SHOT_FROM_CANNON && newcam_active) { - gMarioState->area->camera->mode = CAM_MODE_NEWCAM; - gLakituState.mode = CAM_MODE_NEWCAM; + gMarioState->area->camera->mode = CAMERA_MODE_NEWCAM; + gLakituState.mode = CAMERA_MODE_NEWCAM; } #endif