popux/perfect_dark
1
0 Fork 0
forked from Ports/perfect_dark
Code Pull Requests Activity

Merge pull request #551 from ZenithMDC/increase-mouse-speed-precision

Browse Source 
Increase precision for mouse speed options
This commit is contained in:
fgsfds authored and GitHub committed 2024-12-08 13:40:23 +01:00
2 parents 903dd82ebf cb449bf7ce
commit 2439eb6e8d
1 file changed
+30 -20
Download Patch File Download Diff File Expand all files Collapse all files
port/src/optionsmenu.c
+30 -20
View File
@@ -170,15 +170,17 @@ static MenuItemHandlerResult menuhandlerMouseSpeedX(s32 operation, struct menuit
if (x < 0.f) { if (x < 0.f) {
data->slider.value = 0; data->slider.value = 0;
} else if (x > 10.f) { } else if (x > 10.f) {
data->slider.value = 100; data->slider.value = 1000;
} else { } else {
data->slider.value = x * 10.f + 0.5f; data->slider.value = x * 100.f + 0.5f;
} }
break; break;
case MENUOP_SET: case MENUOP_SET:
inputMouseGetSpeed(&x, &y); inputMouseGetSpeed(&x, &y);
inputMouseSetSpeed((f32)data->slider.value / 10.f, y); inputMouseSetSpeed((f32)data->slider.value / 100.f, y);
break; break;
case MENUOP_GETSLIDERLABEL:
sprintf(data->slider.label, "%.2f", (f32)data->slider.value / 100.f);
} }
return 0; return 0;
@@ -194,15 +196,17 @@ static MenuItemHandlerResult menuhandlerMouseSpeedY(s32 operation, struct menuit
if (y < 0.f) { if (y < 0.f) {
data->slider.value = 0; data->slider.value = 0;
} else if (y > 10.f) { } else if (y > 10.f) {
data->slider.value = 100; data->slider.value = 1000;
} else { } else {
data->slider.value = y * 10.f + 0.5f; data->slider.value = y * 100.f + 0.5f;
} }
break; break;
case MENUOP_SET: case MENUOP_SET:
inputMouseGetSpeed(&x, &y); inputMouseGetSpeed(&x, &y);
inputMouseSetSpeed(x, (f32)data->slider.value / 10.f); inputMouseSetSpeed(x, (f32)data->slider.value / 100.f);
break; break;
case MENUOP_GETSLIDERLABEL:
sprintf(data->slider.label, "%.2f", (f32)data->slider.value / 100.f);
} }
return 0; return 0;
@@ -215,14 +219,16 @@ static MenuItemHandlerResult menuhandlerMouseAimSpeedX(s32 operation, struct men
if (g_PlayerExtCfg[g_ExtMenuPlayer].mouseaimspeedx < 0.f) { if (g_PlayerExtCfg[g_ExtMenuPlayer].mouseaimspeedx < 0.f) {
data->slider.value = 0; data->slider.value = 0;
} else if (g_PlayerExtCfg[g_ExtMenuPlayer].mouseaimspeedx > 10.f) { } else if (g_PlayerExtCfg[g_ExtMenuPlayer].mouseaimspeedx > 10.f) {
data->slider.value = 100; data->slider.value = 1000;
} else { } else {
data->slider.value = g_PlayerExtCfg[g_ExtMenuPlayer].mouseaimspeedx * 10.f + 0.5f; data->slider.value = g_PlayerExtCfg[g_ExtMenuPlayer].mouseaimspeedx * 100.f + 0.5f;
} }
break; break;
case MENUOP_SET: case MENUOP_SET:
g_PlayerExtCfg[g_ExtMenuPlayer].mouseaimspeedx = (f32)data->slider.value / 10.f; g_PlayerExtCfg[g_ExtMenuPlayer].mouseaimspeedx = (f32)data->slider.value / 100.f;
break; break;
case MENUOP_GETSLIDERLABEL:
sprintf(data->slider.label, "%.2f", (f32)data->slider.value / 100.f);
} }
return 0; return 0;
@@ -235,14 +241,16 @@ static MenuItemHandlerResult menuhandlerMouseAimSpeedY(s32 operation, struct men
if (g_PlayerExtCfg[g_ExtMenuPlayer].mouseaimspeedy < 0.f) { if (g_PlayerExtCfg[g_ExtMenuPlayer].mouseaimspeedy < 0.f) {
data->slider.value = 0; data->slider.value = 0;
} else if (g_PlayerExtCfg[g_ExtMenuPlayer].mouseaimspeedy > 10.f) { } else if (g_PlayerExtCfg[g_ExtMenuPlayer].mouseaimspeedy > 10.f) {
data->slider.value = 100; data->slider.value = 1000;
} else { } else {
data->slider.value = g_PlayerExtCfg[g_ExtMenuPlayer].mouseaimspeedy * 10.f + 0.5f; data->slider.value = g_PlayerExtCfg[g_ExtMenuPlayer].mouseaimspeedy * 100.f + 0.5f;
} }
break; break;
case MENUOP_SET: case MENUOP_SET:
g_PlayerExtCfg[g_ExtMenuPlayer].mouseaimspeedy = (f32)data->slider.value / 10.f; g_PlayerExtCfg[g_ExtMenuPlayer].mouseaimspeedy = (f32)data->slider.value / 100.f;
break; break;
case MENUOP_GETSLIDERLABEL:
sprintf(data->slider.label, "%.2f", (f32)data->slider.value / 100.f);
} }
return 0; return 0;
@@ -255,14 +263,16 @@ static MenuItemHandlerResult menuhandlerRadialMenuSpeed(s32 operation, struct me
if (g_PlayerExtCfg[0].radialmenuspeed < 0.f) { if (g_PlayerExtCfg[0].radialmenuspeed < 0.f) {
data->slider.value = 0; data->slider.value = 0;
} else if (g_PlayerExtCfg[0].radialmenuspeed > 10.f) { } else if (g_PlayerExtCfg[0].radialmenuspeed > 10.f) {
data->slider.value = 100; data->slider.value = 1000;
} else { } else {
data->slider.value = g_PlayerExtCfg[0].radialmenuspeed * 10.f + 0.5f; data->slider.value = g_PlayerExtCfg[0].radialmenuspeed * 100.f + 0.5f;
} }
break; break;
case MENUOP_SET: case MENUOP_SET:
g_PlayerExtCfg[0].radialmenuspeed = (f32)data->slider.value / 10.f; g_PlayerExtCfg[0].radialmenuspeed = (f32)data->slider.value / 100.f;
break; break;
case MENUOP_GETSLIDERLABEL:
sprintf(data->slider.label, "%.2f", (f32)data->slider.value / 100.f);
} }
return 0; return 0;
@@ -314,7 +324,7 @@ struct menuitem g_ExtendedMouseMenuItems[] = {
0, 0,
MENUITEMFLAG_LITERAL_TEXT | MENUITEMFLAG_SLIDER_WIDE, MENUITEMFLAG_LITERAL_TEXT | MENUITEMFLAG_SLIDER_WIDE,
(uintptr_t)"Mouse Speed X", (uintptr_t)"Mouse Speed X",
100, 1000,
menuhandlerMouseSpeedX, menuhandlerMouseSpeedX,
}, },
{ {
@@ -322,7 +332,7 @@ struct menuitem g_ExtendedMouseMenuItems[] = {
0, 0,
MENUITEMFLAG_LITERAL_TEXT | MENUITEMFLAG_SLIDER_WIDE, MENUITEMFLAG_LITERAL_TEXT | MENUITEMFLAG_SLIDER_WIDE,
(uintptr_t)"Mouse Speed Y", (uintptr_t)"Mouse Speed Y",
100, 1000,
menuhandlerMouseSpeedY, menuhandlerMouseSpeedY,
}, },
{ {
@@ -330,7 +340,7 @@ struct menuitem g_ExtendedMouseMenuItems[] = {
0, 0,
MENUITEMFLAG_LITERAL_TEXT | MENUITEMFLAG_SLIDER_WIDE, MENUITEMFLAG_LITERAL_TEXT | MENUITEMFLAG_SLIDER_WIDE,
(uintptr_t)"Crosshair Speed X", (uintptr_t)"Crosshair Speed X",
100, 1000,
menuhandlerMouseAimSpeedX, menuhandlerMouseAimSpeedX,
}, },
{ {
@@ -338,7 +348,7 @@ struct menuitem g_ExtendedMouseMenuItems[] = {
0, 0,
MENUITEMFLAG_LITERAL_TEXT | MENUITEMFLAG_SLIDER_WIDE, MENUITEMFLAG_LITERAL_TEXT | MENUITEMFLAG_SLIDER_WIDE,
(uintptr_t)"Crosshair Speed Y", (uintptr_t)"Crosshair Speed Y",
100, 1000,
menuhandlerMouseAimSpeedY, menuhandlerMouseAimSpeedY,
}, },
{ {
@@ -346,7 +356,7 @@ struct menuitem g_ExtendedMouseMenuItems[] = {
0, 0,
MENUITEMFLAG_LITERAL_TEXT | MENUITEMFLAG_SLIDER_WIDE, MENUITEMFLAG_LITERAL_TEXT | MENUITEMFLAG_SLIDER_WIDE,
(uintptr_t)"Radial Menu Speed", (uintptr_t)"Radial Menu Speed",
100, 1000,
menuhandlerRadialMenuSpeed, menuhandlerRadialMenuSpeed,
}, },
{ {