thirdpartymirrors/sm64coopdx
1
0
Fork 0
mirror of https://github.com/coop-deluxe/sm64coopdx.git synced 2026-04-26 12:01:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix freecam not being toggleable after teleport warp (#1133)

Browse source 
This was happening because the previous mode would be reset before it was actually called. It was unique to `WARP_TYPE_SAME_AREA`. The solution is explained in the code comment. Also added some unused keywords to suppress warnings.
This commit is contained in:
EmeraldLockdown 2026-03-10 18:33:38 -05:00 • committed by GitHub
parent 52446ded91
commit 5ca41153a6
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 17 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/game/camera.c
View file

@ -1781,7 +1781,7 @@ s32 unused_update_mode_5_camera(UNUSED struct Camera *c, UNUSED Vec3f focus, UNU
return 0;
}
static void stub_camera_1(UNUSED s32 unused) {
UNUSED static void stub_camera_1(UNUSED s32 unused) {
}
void mode_boss_fight_camera(struct Camera *c) {
@ -5614,7 +5614,7 @@ void set_focus_rel_mario(struct Camera *c, f32 leftRight, f32 yOff, f32 forwBack
* @param forwBack offset to Mario's front/back, relative to his faceAngle
* @param yawOff offset to Mario's faceAngle, changes the direction of `leftRight` and `forwBack`
*/
static void unused_set_pos_rel_mario(struct Camera *c, f32 leftRight, f32 yOff, f32 forwBack, s16 yawOff) {
UNUSED static void unused_set_pos_rel_mario(struct Camera *c, f32 leftRight, f32 yOff, f32 forwBack, s16 yawOff) {
if (!c) { return; }
u16 yaw = sMarioCamState->faceAngle[1] + yawOff;
@ -7606,7 +7606,7 @@ void cutscene_unsoften_music(UNUSED struct Camera *c) {
seq_player_unlower_volume(SEQ_PLAYER_LEVEL, 60);
}
static void stub_camera_5(UNUSED struct Camera *c) {
UNUSED static void stub_camera_5(UNUSED struct Camera *c) {
}
BAD_RETURN(s32) cutscene_unused_start(UNUSED struct Camera *c) {
@ -8133,7 +8133,7 @@ BAD_RETURN(s32) cutscene_dance_rotate_move_towards_mario(struct Camera *c) {
/**
* Speculated to be dance-related due to its proximity to the other dance functions
*/
static BAD_RETURN(s32) cutscene_dance_unused(UNUSED struct Camera *c) {
UNUSED static BAD_RETURN(s32) cutscene_dance_unused(UNUSED struct Camera *c) {
}
/**
@ -9089,7 +9089,7 @@ BAD_RETURN(s32) cutscene_death_stomach_goto_mario(struct Camera *c) {
/**
* Ah, yes
*/
static void unused_water_death_move_to_side_of_mario(struct Camera *c) {
UNUSED static void unused_water_death_move_to_side_of_mario(struct Camera *c) {
water_death_move_to_mario_side(c);
}
@ -9377,7 +9377,7 @@ BAD_RETURN(s32) cutscene_enter_pyramid_top(struct Camera *c) {
}
}
static void unused_cutscene_goto_cvar(struct Camera *c) {
UNUSED static void unused_cutscene_goto_cvar(struct Camera *c) {
if (!c) { return; }
f32 dist;
@ -9543,7 +9543,7 @@ BAD_RETURN(s32) cutscene_read_message_start(struct Camera *c) {
sCutsceneVars[0].angle[0] = 0;
}
static void unused_cam_to_mario(struct Camera *c) {
UNUSED static void unused_cam_to_mario(struct Camera *c) {
if (!c) { return; }
Vec3s dir;
@ -10972,7 +10972,7 @@ void cutscene_palette_editor(struct Camera *c) {
&gDjuiPaletteToggle->base,
(
m->action == ACT_IDLE ||
m->action == ACT_PALETTE_EDITOR_CAP
m->action == ACT_PALETTE_EDITOR_CAP
) && !capMissing
);
}

9
src/game/level_update.c
View file

@ -18,6 +18,7 @@
#include "sound_init.h"
#include "mario.h"
#include "camera.h"
#include "bettercamera.h"
#include "object_list_processor.h"
#include "ingame_menu.h"
#include "obj_behaviors.h"
@ -471,6 +472,14 @@ void init_mario_after_warp(void) {
if (gCurrentArea) {
reset_camera(gCurrentArea->camera);
if (sWarpDest.type == WARP_TYPE_SAME_AREA && gCurrentArea->camera->mode == CAMERA_MODE_NEWCAM) {
// When we warp to a level in the same area, the camera mode never has the chance
// to reset. This is bad if our camera mode is newcam, since when init cam is called
// our old camera mode will be set to newcam, which causes newcam to not be able to be
// turned off. The fix is setting our mode to newcam's old mode
gCurrentArea->camera->mode = gNewCamera.savedMode;
gCurrentArea->camera->defMode = gNewCamera.savedDefMode;
}
}
sWarpDest.type = WARP_TYPE_NOT_WARPING;
sDelayedWarpOp = WARP_OP_NONE;