Archive/Shipwright
0
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2025-04-29 05:37:59 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed right stick aiming being significantly less precise than left stick aiming.

Browse source
This commit is contained in:
Proloe 2025-04-11 17:34:11 +01:00
parent 05e96f310d
commit eee2b4d19d
1 changed files with 10 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

24
soh/src/overlays/actors/ovl_player_actor/z_player.c
View file

@ -12773,9 +12773,8 @@ s16 func_8084ABD8(PlayState* play, Player* this, s32 arg2, s16 arg3) {
if (!CVarGetInteger(CVAR_SETTING("MoveInFirstPerson"), 0)) { if (!CVarGetInteger(CVAR_SETTING("MoveInFirstPerson"), 0)) {
temp2 += sControlInput->rel.stick_y * 240.0f * invertYAxisMulti * yAxisMulti; temp2 += sControlInput->rel.stick_y * 240.0f * invertYAxisMulti * yAxisMulti;
} }
if (CVarGetInteger(CVAR_SETTING("Controls.RightStickAim"), 0) && if (CVarGetInteger(CVAR_SETTING("Controls.RightStickAim"), 0)) {
fabsf(sControlInput->cur.right_stick_y) > 15.0f) { temp2 += sControlInput->rel.right_stick_y * 240.0f * invertYAxisMulti * yAxisMulti;
temp2 += sControlInput->cur.right_stick_y * 240.0f * invertYAxisMulti * yAxisMulti;
} }
if (fabsf(sControlInput->cur.gyro_x) > 0.01f) { if (fabsf(sControlInput->cur.gyro_x) > 0.01f) {
temp2 += (-sControlInput->cur.gyro_x) * 750.0f; temp2 += (-sControlInput->cur.gyro_x) * 750.0f;
@ -12792,9 +12791,8 @@ s16 func_8084ABD8(PlayState* play, Player* this, s32 arg2, s16 arg3) {
if (!CVarGetInteger(CVAR_SETTING("MoveInFirstPerson"), 0)) { if (!CVarGetInteger(CVAR_SETTING("MoveInFirstPerson"), 0)) {
temp2 += sControlInput->rel.stick_x * -16.0f * invertXAxisMulti * xAxisMulti; temp2 += sControlInput->rel.stick_x * -16.0f * invertXAxisMulti * xAxisMulti;
} }
if (CVarGetInteger(CVAR_SETTING("Controls.RightStickAim"), 0) && if (CVarGetInteger(CVAR_SETTING("Controls.RightStickAim"), 0)) {
fabsf(sControlInput->cur.right_stick_x) > 15.0f) { temp2 += sControlInput->rel.right_stick_x * -16.0f * invertXAxisMulti * xAxisMulti;
temp2 += sControlInput->cur.right_stick_x * -16.0f * invertXAxisMulti * xAxisMulti;
} }
if (fabsf(sControlInput->cur.gyro_y) > 0.01f) { if (fabsf(sControlInput->cur.gyro_y) > 0.01f) {
temp2 += (sControlInput->cur.gyro_y) * 750.0f * invertXAxisMulti; temp2 += (sControlInput->cur.gyro_y) * 750.0f * invertXAxisMulti;
@ -12810,10 +12808,9 @@ s16 func_8084ABD8(PlayState* play, Player* this, s32 arg2, s16 arg3) {
(s32)((1.0f - Math_CosS(sControlInput->rel.stick_y * 200)) * 1500.0f) * invertYAxisMulti * (s32)((1.0f - Math_CosS(sControlInput->rel.stick_y * 200)) * 1500.0f) * invertYAxisMulti *
yAxisMulti; yAxisMulti;
} }
if (CVarGetInteger(CVAR_SETTING("Controls.RightStickAim"), 0) && if (CVarGetInteger(CVAR_SETTING("Controls.RightStickAim"), 0)) {
fabsf(sControlInput->cur.right_stick_y) > 15.0f) { temp3 += ((sControlInput->rel.right_stick_y >= 0) ? 1 : -1) *
temp3 += ((sControlInput->cur.right_stick_y >= 0) ? 1 : -1) * (s32)((1.0f - Math_CosS(sControlInput->rel.right_stick_y * 200)) * 1500.0f) * invertYAxisMulti *
(s32)((1.0f - Math_CosS(sControlInput->cur.right_stick_y * 200)) * 1500.0f) * invertYAxisMulti *
yAxisMulti; yAxisMulti;
} }
if (fabsf(sControlInput->cur.gyro_x) > 0.01f) { if (fabsf(sControlInput->cur.gyro_x) > 0.01f) {
@ -12831,10 +12828,9 @@ s16 func_8084ABD8(PlayState* play, Player* this, s32 arg2, s16 arg3) {
(s32)((1.0f - Math_CosS(sControlInput->rel.stick_x * 200)) * -1500.0f) * invertXAxisMulti * (s32)((1.0f - Math_CosS(sControlInput->rel.stick_x * 200)) * -1500.0f) * invertXAxisMulti *
xAxisMulti; xAxisMulti;
} }
if (CVarGetInteger(CVAR_SETTING("Controls.RightStickAim"), 0) && if (CVarGetInteger(CVAR_SETTING("Controls.RightStickAim"), 0)) {
fabsf(sControlInput->cur.right_stick_x) > 15.0f) { temp3 += ((sControlInput->rel.right_stick_x >= 0) ? 1 : -1) *
temp3 += ((sControlInput->cur.right_stick_x >= 0) ? 1 : -1) * (s32)((1.0f - Math_CosS(sControlInput->rel.right_stick_x * 200)) * -1500.0f) * invertXAxisMulti *
(s32)((1.0f - Math_CosS(sControlInput->cur.right_stick_x * 200)) * -1500.0f) * invertXAxisMulti *
xAxisMulti; xAxisMulti;
} }
if (fabsf(sControlInput->cur.gyro_y) > 0.01f) { if (fabsf(sControlInput->cur.gyro_y) > 0.01f) {