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

Further fix camera (#727)
Some checks are pending
Build coop / build-ubuntu (push) Waiting to run
Details
Build coop / build-windows (push) Waiting to run
Details
Build coop / build-macos-arm (push) Waiting to run
Details
Build coop / build-macos-intel (push) Waiting to run
Details

Browse source 
* Further fix camera

* Remove re-override
This commit is contained in:
Sunk 2025-04-01 20:35:13 -04:00 • committed by GitHub
parent c2823c268e
commit 110d6ef32e
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/game/camera.c
View file

@ -42,6 +42,7 @@
static u8 sSoftResettingCamera = FALSE; static u8 sSoftResettingCamera = FALSE;
u8 gCameraUseCourseSpecificSettings = TRUE; u8 gCameraUseCourseSpecificSettings = TRUE;
u8 CCSSChangedByMod = FALSE;
u8 gOverrideFreezeCamera = FALSE; u8 gOverrideFreezeCamera = FALSE;
u8 gOverrideAllowToxicGasCamera = FALSE; u8 gOverrideAllowToxicGasCamera = FALSE;
@ -69,6 +70,8 @@ void romhack_camera_reset_settings(void) {
gRomhackCameraSettings.zoomedInHeight = 300; gRomhackCameraSettings.zoomedInHeight = 300;
gRomhackCameraSettings.zoomedOutHeight = 450; gRomhackCameraSettings.zoomedOutHeight = 450;
gRomhackCameraSettings.modsOnly = FALSE; gRomhackCameraSettings.modsOnly = FALSE;
gCameraUseCourseSpecificSettings = TRUE;
CCSSChangedByMod = FALSE;
} }
/** /**
@ -12171,6 +12174,7 @@ void obj_rotate_towards_point(struct Object *o, Vec3f point, s16 pitchOff, s16 y
void camera_set_use_course_specific_settings(u8 enable) { void camera_set_use_course_specific_settings(u8 enable) {
gCameraUseCourseSpecificSettings = enable; gCameraUseCourseSpecificSettings = enable;
CCSSChangedByMod = TRUE;
} }
#include "behaviors/intro_peach.inc.c" #include "behaviors/intro_peach.inc.c"
@ -12212,7 +12216,9 @@ void romhack_camera_init_settings(void) {
} }
gRomhackCameraSettings.enable = override; gRomhackCameraSettings.enable = override;
gCameraUseCourseSpecificSettings = (dynos_level_is_vanilla_level(gCurrLevelNum)); if (!CCSSChangedByMod) {
gCameraUseCourseSpecificSettings = dynos_level_is_vanilla_level(gCurrLevelNum);
}
gRomhackCameraSettings.collisions = configRomhackCameraHasCollision; gRomhackCameraSettings.collisions = configRomhackCameraHasCollision;
gRomhackCameraSettings.centering = configRomhackCameraHasCentering; gRomhackCameraSettings.centering = configRomhackCameraHasCentering;
gRomhackCameraSettings.dpad = configRomhackCameraDPadBehavior; gRomhackCameraSettings.dpad = configRomhackCameraDPadBehavior;

1
src/pc/network/network.c
View file

@ -703,7 +703,6 @@ void network_shutdown(bool sendLeaving, bool exiting, bool popup, bool reconnect
extern s16 gChangeLevel; extern s16 gChangeLevel;
gChangeLevel = LEVEL_CASTLE_GROUNDS; gChangeLevel = LEVEL_CASTLE_GROUNDS;
network_player_init(); network_player_init();
camera_set_use_course_specific_settings(true);
gMarioStates[0].cap = 0; gMarioStates[0].cap = 0;
gMarioStates[0].input = 0; gMarioStates[0].input = 0;
extern s16 gTTCSpeedSetting; extern s16 gTTCSpeedSetting;