thirdpartymirrors/sm64coopdx
1
0
Fork 0
mirror of https://github.com/coop-deluxe/sm64coopdx.git synced 2025-12-04 23:22:30 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Camera collision option changes

Browse source 
Sorry but me and dj came to an agreement that this just gives people an unfair competitive edge. Mods still have full capability to change camera collision options though.
This commit is contained in:
Agent X 2025-11-25 13:09:50 -05:00
parent 454e567ca8
commit faf68af15e
5 changed files with 2 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/game/camera.c
View file

@ -12233,7 +12233,7 @@ void romhack_camera_init_settings(void) {
if (!sCCSSChangedByMod) {
gCameraUseCourseSpecificSettings = dynos_level_is_vanilla_level(gCurrLevelNum);
}
gRomhackCameraSettings.collisions = configRomhackCameraHasCollision;
gRomhackCameraSettings.collisions = TRUE;
gRomhackCameraSettings.centering = configRomhackCameraHasCentering;
gRomhackCameraSettings.dpad = configRomhackCameraDPadBehavior;
gOverrideAllowToxicGasCamera = configCameraToxicGas;

4
src/pc/configfile.c
View file

@ -135,7 +135,6 @@ bool configEnableFreeCamera = false;
bool configFreeCameraAnalog = false;
bool configFreeCameraLCentering = false;
bool configFreeCameraDPadBehavior = false;
bool configFreeCameraHasCollision = true;
bool configFreeCameraMouse = false;
unsigned int configFreeCameraXSens = 50;
unsigned int configFreeCameraYSens = 50;
@ -145,7 +144,6 @@ unsigned int configFreeCameraDegrade = 50; // 0 - 100%
// romhack camera settings
unsigned int configEnableRomhackCamera = 0; // 0 for automatic, 1 for force on, 2 for force off
bool configRomhackCameraBowserFights = false;
bool configRomhackCameraHasCollision = true;
bool configRomhackCameraHasCentering = false;
bool configRomhackCameraDPadBehavior = false;
bool configRomhackCameraSlowFall = true;
@ -286,7 +284,6 @@ static const struct ConfigOption options[] = {
{.name = "bettercam_analog", .type = CONFIG_TYPE_BOOL, .boolValue = &configFreeCameraAnalog},
{.name = "bettercam_centering", .type = CONFIG_TYPE_BOOL, .boolValue = &configFreeCameraLCentering},
{.name = "bettercam_dpad", .type = CONFIG_TYPE_BOOL, .boolValue = &configFreeCameraDPadBehavior},
{.name = "bettercam_collision", .type = CONFIG_TYPE_BOOL, .boolValue = &configFreeCameraHasCollision},
{.name = "bettercam_mouse_look", .type = CONFIG_TYPE_BOOL, .boolValue = &configFreeCameraMouse},
{.name = "bettercam_xsens", .type = CONFIG_TYPE_UINT, .uintValue = &configFreeCameraXSens},
{.name = "bettercam_ysens", .type = CONFIG_TYPE_UINT, .uintValue = &configFreeCameraYSens},
@ -296,7 +293,6 @@ static const struct ConfigOption options[] = {
// romhack camera settings
{.name = "romhackcam_enable", .type = CONFIG_TYPE_UINT, .uintValue = &configEnableRomhackCamera},
{.name = "romhackcam_bowser", .type = CONFIG_TYPE_BOOL, .boolValue = &configRomhackCameraBowserFights},
{.name = "romhackcam_collision", .type = CONFIG_TYPE_BOOL, .boolValue = &configRomhackCameraHasCollision},
{.name = "romhackcam_centering", .type = CONFIG_TYPE_BOOL, .boolValue = &configRomhackCameraHasCentering},
{.name = "romhackcam_dpad", .type = CONFIG_TYPE_BOOL, .boolValue = &configRomhackCameraDPadBehavior},
{.name = "romhackcam_slowfall", .type = CONFIG_TYPE_BOOL, .boolValue = &configRomhackCameraSlowFall},

2
src/pc/configfile.h
View file

@ -101,7 +101,6 @@ extern bool configEnableFreeCamera;
extern bool configFreeCameraAnalog;
extern bool configFreeCameraLCentering;
extern bool configFreeCameraDPadBehavior;
extern bool configFreeCameraHasCollision;
extern bool configFreeCameraMouse;
extern unsigned int configFreeCameraXSens;
extern unsigned int configFreeCameraYSens;
@ -111,7 +110,6 @@ extern unsigned int configFreeCameraDegrade;
// romhack camera settings
extern unsigned int configEnableRomhackCamera;
extern bool configRomhackCameraBowserFights;
extern bool configRomhackCameraHasCollision;
extern bool configRomhackCameraHasCentering;
extern bool configRomhackCameraDPadBehavior;
extern bool configRomhackCameraSlowFall;

2
src/pc/djui/djui_panel_camera.c
View file

@ -23,7 +23,6 @@ void djui_panel_free_camera_create(struct DjuiBase* caller) {
djui_checkbox_create(body, DLANG(CAMERA, ANALOG_CAMERA), &configFreeCameraAnalog, djui_panel_free_camera_value_changed);
djui_checkbox_create(body, DLANG(CAMERA, ROMHACK_CAMERA_L_CENTERING), &configFreeCameraLCentering, djui_panel_free_camera_value_changed);
djui_checkbox_create(body, DLANG(CAMERA, FREE_CAMERA_USE_DPAD), &configFreeCameraDPadBehavior, djui_panel_free_camera_value_changed);
djui_checkbox_create(body, DLANG(CAMERA, FREE_CAMERA_COLLISION), &configFreeCameraHasCollision, djui_panel_free_camera_value_changed);
djui_checkbox_create(body, DLANG(CAMERA, MOUSE_LOOK), &configFreeCameraMouse, djui_panel_free_camera_value_changed);
djui_slider_create(body, DLANG(CAMERA, X_SENSITIVITY), &configFreeCameraXSens, 1, 100, djui_panel_free_camera_value_changed);
djui_slider_create(body, DLANG(CAMERA, Y_SENSITIVITY), &configFreeCameraYSens, 1, 100, djui_panel_free_camera_value_changed);
@ -44,7 +43,6 @@ void djui_panel_romhack_camera_create(struct DjuiBase* caller) {
char* choices[3] = { DLANG(CAMERA, ROMHACK_CAMERA_AUTOMATIC), DLANG(CAMERA, ROMHACK_CAMERA_ON), DLANG(CAMERA, ROMHACK_CAMERA_OFF) };
djui_selectionbox_create(body, DLANG(CAMERA, ROMHACK_CAMERA), choices, 3, &configEnableRomhackCamera, djui_panel_romhack_camera_value_changed);
djui_checkbox_create(body, DLANG(CAMERA, ROMHACK_CAMERA_IN_BOWSER), &configRomhackCameraBowserFights, djui_panel_romhack_camera_value_changed);
djui_checkbox_create(body, DLANG(CAMERA, ROMHACK_CAMERA_COLLISION), &configRomhackCameraHasCollision, djui_panel_romhack_camera_value_changed);
djui_checkbox_create(body, DLANG(CAMERA, ROMHACK_CAMERA_L_CENTERING), &configRomhackCameraHasCentering, djui_panel_romhack_camera_value_changed);
djui_checkbox_create(body, DLANG(CAMERA, ROMHACK_CAMERA_USE_DPAD), &configRomhackCameraDPadBehavior, djui_panel_romhack_camera_value_changed);
djui_checkbox_create(body, DLANG(CAMERA, ROMHACK_CAMERA_SLOW_FALL), &configRomhackCameraSlowFall, djui_panel_romhack_camera_value_changed);

2
src/pc/lua/utils/smlua_camera_utils.c
View file

@ -138,7 +138,7 @@ bool camera_config_is_dpad_enabled(void) {
}
bool camera_config_is_collision_enabled(void) {
return sOverrideCameraCollision.override ? sOverrideCameraCollision.value : configFreeCameraHasCollision;
return sOverrideCameraCollision.override ? sOverrideCameraCollision.value : true;
}
bool camera_config_is_mouse_look_enabled(void) {