From 9f876390f08fa1e11f640b476034266819a130cc Mon Sep 17 00:00:00 2001 From: Bill Currie Date: Sun, 24 Apr 2022 17:57:20 +0900 Subject: [PATCH] [input] Fix up some mistranslated cvars My script didn't know what type to make the cvars since they're not used directly by the code, so they got treated as strings instead of ints or floats. --- include/QF/input.h | 2 +- libs/input/in_common.c | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/include/QF/input.h b/include/QF/input.h index 2b85ee3c4..6b4167aca 100644 --- a/include/QF/input.h +++ b/include/QF/input.h @@ -131,7 +131,7 @@ extern float in_amp; extern float in_pre_amp; extern int in_mouse_accel; extern int in_freelook; -extern char *lookstrafe; +extern int lookstrafe; #endif diff --git a/libs/input/in_common.c b/libs/input/in_common.c index de8e22a68..f2d895e10 100644 --- a/libs/input/in_common.c +++ b/libs/input/in_common.c @@ -107,41 +107,41 @@ static cvar_t in_freelook_cvar = { .flags = CVAR_ARCHIVE, .value = { .type = &cexpr_int, .value = &in_freelook }, }; -char *in_mouse_filter; +int in_mouse_filter; static cvar_t in_mouse_filter_cvar = { .name = "in_mouse_filter", .description = "Toggle mouse input filtering.", .default_value = "0", .flags = CVAR_ARCHIVE, - .value = { .type = 0/* not used */, .value = &in_mouse_filter }, + .value = { .type = &cexpr_int, .value = &in_mouse_filter }, }; -char *in_mouse_amp; +float in_mouse_amp; static cvar_t in_mouse_amp_cvar = { .name = "in_mouse_amp", .description = "mouse in_mouse_amp multiplier", .default_value = "15", .flags = CVAR_ARCHIVE, - .value = { .type = 0/* not used */, .value = &in_mouse_amp }, + .value = { .type = &cexpr_float, .value = &in_mouse_amp }, }; -char *in_mouse_pre_amp; +float in_mouse_pre_amp; static cvar_t in_mouse_pre_amp_cvar = { .name = "in_mouse_pre_amp", .description = "mouse in_mouse_pre_amp multiplier", .default_value = "1", .flags = CVAR_ARCHIVE, - .value = { .type = 0/* not used */, .value = &in_mouse_pre_amp }, + .value = { .type = &cexpr_float, .value = &in_mouse_pre_amp }, }; -char *lookstrafe; +int lookstrafe; static cvar_t lookstrafe_cvar = { .name = "lookstrafe", .description = "when mlook/klook on player will strafe", .default_value = "0", .flags = CVAR_ARCHIVE, - .value = { .type = 0/* not used */, .value = &lookstrafe }, + .value = { .type = &cexpr_int, .value = &lookstrafe }, }; int64_t in_timeout = 10000;//10ms default timeout