Merge pull request #188 from NeonNyan/ammenu-abs

hack: cp `inputMouseGetScaled -> inputMouseGetScaledDeltaAbsSens` for intuitive amenu UX while using aim inversion
This commit is contained in:
fgsfds authored and GitHub committed 2023-09-30 12:41:49 +02:00
commit 608b02d363
2 files changed
+15 -1

No files matched your search

+14
View File
@@ -727,6 +727,20 @@ void inputMouseGetScaledDelta(f32 *dx, f32 *dy)
if (dy) *dy = mdy;
}
void inputMouseGetScaledDeltaAbsSens(f32 *dx, f32 *dy)
{
f32 mdx, mdy;
if (mouseLocked) {
mdx = fabsf(mouseSensX) * (f32)mouseDX / 100.0f;
mdy = fabsf(mouseSensY) * (f32)mouseDY / 100.0f;
} else {
mdx = 0.f;
mdy = 0.f;
}
if (dx) *dx = mdx;
if (dy) *dy = mdy;
}
const char *inputGetContKeyName(u32 ck)
{
if (ck >= CK_TOTAL_COUNT) {
+1 -1
View File
@@ -70,7 +70,7 @@ void amTick(void)
if (j == 0 && g_Vars.currentplayernum == 0 && inputMouseIsLocked()) {
f32 mdx, mdy;
struct activemenu *am = &g_AmMenus[g_AmIndex];
inputMouseGetScaledDelta(&mdx, &mdy);
inputMouseGetScaledDeltaAbsSens(&mdx, &mdy);
if (mdx || mdy) {
am->mousex += mdx * 4.f;
am->mousey += mdy * 4.f;