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

Allowed user to override forced camera centering when sliding/flying

Browse source
This commit is contained in:
MysterD 2023-05-04 12:55:59 -07:00
parent dde4eb4cb5
commit 5a19d84423
1 changed files with 25 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
src/game/bettercamera.inc.h
View file

@ -431,6 +431,7 @@ static void newcam_zoom_button(void) {
static void newcam_update_values(void) { static void newcam_update_values(void) {
//For tilt, this just limits it so it doesn't go further than 90 degrees either way. 90 degrees is actually 16384, but can sometimes lead to issues, so I just leave it shy of 90. //For tilt, this just limits it so it doesn't go further than 90 degrees either way. 90 degrees is actually 16384, but can sometimes lead to issues, so I just leave it shy of 90.
u8 waterflag = 0; u8 waterflag = 0;
u8 centering = 0;
if (newcam_modeflags & NC_FLAG_XTURN) if (newcam_modeflags & NC_FLAG_XTURN)
newcam_yaw -= ((newcam_yaw_acc*(newcam_sensitivityX/10))*ivrt(0)); newcam_yaw -= ((newcam_yaw_acc*(newcam_sensitivityX/10))*ivrt(0));
@ -455,16 +456,34 @@ static void newcam_update_values(void) {
if (newcam_modeflags & NC_FLAG_SLIDECORRECT) { if (newcam_modeflags & NC_FLAG_SLIDECORRECT) {
switch (gMarioStates[0].action) { switch (gMarioStates[0].action) {
case ACT_BUTT_SLIDE: if (gMarioStates[0].forwardVel > 8) waterflag = 1; break; case ACT_BUTT_SLIDE: if (gMarioStates[0].forwardVel > 8) centering = 1; break;
case ACT_STOMACH_SLIDE: if (gMarioStates[0].forwardVel > 8) waterflag = 1; break; case ACT_STOMACH_SLIDE: if (gMarioStates[0].forwardVel > 8) centering = 1; break;
case ACT_HOLD_BUTT_SLIDE: if (gMarioStates[0].forwardVel > 8) waterflag = 1; break; case ACT_HOLD_BUTT_SLIDE: if (gMarioStates[0].forwardVel > 8) centering = 1; break;
case ACT_HOLD_STOMACH_SLIDE: if (gMarioStates[0].forwardVel > 8) waterflag = 1; break; case ACT_HOLD_STOMACH_SLIDE: if (gMarioStates[0].forwardVel > 8) centering = 1; break;
} }
} }
switch (gMarioStates[0].action) { switch (gMarioStates[0].action) {
case ACT_SHOT_FROM_CANNON: waterflag = 1; break; case ACT_FLYING: centering = 1; break;
case ACT_FLYING: waterflag = 1; break; }
static u32 sLastAction = 0;
static u8 sForceCentering = 10;
if (sLastAction != gMarioStates[0].action) {
sLastAction = gMarioStates[0].action;
sForceCentering = 1;
switch (gMarioStates[0].action) {
case ACT_SHOT_FROM_CANNON:
newcam_yaw = -gMarioStates[0].faceAngle[1]-0x4000;
break;
}
}
if (centering) {
if (fabs(newcam_yaw_acc) > 32 || fabs(newcam_tilt_acc) > 32) {
sForceCentering = 0;
}
if (sForceCentering) { waterflag = 1; }
} }
if (gMarioStates[0].action & ACT_FLAG_SWIMMING) { if (gMarioStates[0].action & ACT_FLAG_SWIMMING) {