From a1d5552f7ffaf512825b7c13064a737d63587095 Mon Sep 17 00:00:00 2001 From: Bradley Bell Date: Mon, 12 Mar 2018 02:51:41 -0700 Subject: [PATCH] cvar.value -> cvar.fixval, for less confusion --- arch/sdl/joydefs.c | 36 ++++++++++++++++++------------------ main/controls.c | 8 ++++---- main/cvar.c | 4 ++-- main/cvar.h | 2 +- main/game.c | 12 ++++++------ 5 files changed, 31 insertions(+), 31 deletions(-) diff --git a/arch/sdl/joydefs.c b/arch/sdl/joydefs.c index fb1aa022..554d061b 100644 --- a/arch/sdl/joydefs.c +++ b/arch/sdl/joydefs.c @@ -58,30 +58,30 @@ void joydefs_sensitivity(void) int nitems = 0; m[nitems].type = NM_TYPE_TEXT; m[nitems].text = "Joystick Sensitivity"; nitems++; - ADD_SLIDER(TXT_TURN_LR, f2i(8 * Config_joystick_sensitivity[AXIS_TURN-1].value), 0, 16); - ADD_SLIDER(TXT_PITCH_UD, f2i(8 * Config_joystick_sensitivity[AXIS_PITCH-1].value), 0, 16); - ADD_SLIDER(TXT_SLIDE_LR, f2i(8 * Config_joystick_sensitivity[AXIS_LEFTRIGHT-1].value), 0, 16); - ADD_SLIDER(TXT_SLIDE_UD, f2i(8 * Config_joystick_sensitivity[AXIS_UPDOWN-1].value), 0, 16); - ADD_SLIDER(TXT_BANK_LR, f2i(8 * Config_joystick_sensitivity[AXIS_BANK-1].value), 0, 16); - ADD_SLIDER(TXT_THROTTLE, f2i(8 * Config_joystick_sensitivity[AXIS_THROTTLE-1].value), 0, 16); + ADD_SLIDER(TXT_TURN_LR, f2i(8 * Config_joystick_sensitivity[AXIS_TURN-1].fixval), 0, 16); + ADD_SLIDER(TXT_PITCH_UD, f2i(8 * Config_joystick_sensitivity[AXIS_PITCH-1].fixval), 0, 16); + ADD_SLIDER(TXT_SLIDE_LR, f2i(8 * Config_joystick_sensitivity[AXIS_LEFTRIGHT-1].fixval), 0, 16); + ADD_SLIDER(TXT_SLIDE_UD, f2i(8 * Config_joystick_sensitivity[AXIS_UPDOWN-1].fixval), 0, 16); + ADD_SLIDER(TXT_BANK_LR, f2i(8 * Config_joystick_sensitivity[AXIS_BANK-1].fixval), 0, 16); + ADD_SLIDER(TXT_THROTTLE, f2i(8 * Config_joystick_sensitivity[AXIS_THROTTLE-1].fixval), 0, 16); m[nitems].type = NM_TYPE_TEXT; m[nitems].text = ""; nitems++; m[nitems].type = NM_TYPE_TEXT; m[nitems].text = "Joystick Deadzone"; nitems++; - ADD_SLIDER(TXT_TURN_LR, f2i(8 * Config_joystick_deadzone[AXIS_TURN-1].value), 0, 16); - ADD_SLIDER(TXT_PITCH_UD, f2i(8 * Config_joystick_deadzone[AXIS_PITCH-1].value), 0, 16); - ADD_SLIDER(TXT_SLIDE_LR, f2i(8 * Config_joystick_deadzone[AXIS_LEFTRIGHT-1].value), 0, 16); - ADD_SLIDER(TXT_SLIDE_UD, f2i(8 * Config_joystick_deadzone[AXIS_UPDOWN-1].value), 0, 16); - ADD_SLIDER(TXT_BANK_LR, f2i(8 * Config_joystick_deadzone[AXIS_BANK-1].value), 0, 16); - ADD_SLIDER(TXT_THROTTLE, f2i(8 * Config_joystick_deadzone[AXIS_THROTTLE-1].value), 0, 16); + ADD_SLIDER(TXT_TURN_LR, f2i(8 * Config_joystick_deadzone[AXIS_TURN-1].fixval), 0, 16); + ADD_SLIDER(TXT_PITCH_UD, f2i(8 * Config_joystick_deadzone[AXIS_PITCH-1].fixval), 0, 16); + ADD_SLIDER(TXT_SLIDE_LR, f2i(8 * Config_joystick_deadzone[AXIS_LEFTRIGHT-1].fixval), 0, 16); + ADD_SLIDER(TXT_SLIDE_UD, f2i(8 * Config_joystick_deadzone[AXIS_UPDOWN-1].fixval), 0, 16); + ADD_SLIDER(TXT_BANK_LR, f2i(8 * Config_joystick_deadzone[AXIS_BANK-1].fixval), 0, 16); + ADD_SLIDER(TXT_THROTTLE, f2i(8 * Config_joystick_deadzone[AXIS_THROTTLE-1].fixval), 0, 16); m[nitems].type = NM_TYPE_TEXT; m[nitems].text = ""; nitems++; m[nitems].type = NM_TYPE_TEXT; m[nitems].text = "Mouse Sensitivity"; nitems++; - ADD_SLIDER(TXT_TURN_LR, f2i(8 * Config_mouse_sensitivity[AXIS_TURN-1].value), 0, 16); - ADD_SLIDER(TXT_PITCH_UD, f2i(8 * Config_mouse_sensitivity[AXIS_PITCH-1].value), 0, 16); - ADD_SLIDER(TXT_SLIDE_LR, f2i(8 * Config_mouse_sensitivity[AXIS_LEFTRIGHT-1].value), 0, 16); - ADD_SLIDER(TXT_SLIDE_UD, f2i(8 * Config_mouse_sensitivity[AXIS_UPDOWN-1].value), 0, 16); - ADD_SLIDER(TXT_BANK_LR, f2i(8 * Config_mouse_sensitivity[AXIS_BANK-1].value), 0, 16); - ADD_SLIDER(TXT_THROTTLE, f2i(8 * Config_mouse_sensitivity[AXIS_THROTTLE-1].value), 0, 16); + ADD_SLIDER(TXT_TURN_LR, f2i(8 * Config_mouse_sensitivity[AXIS_TURN-1].fixval), 0, 16); + ADD_SLIDER(TXT_PITCH_UD, f2i(8 * Config_mouse_sensitivity[AXIS_PITCH-1].fixval), 0, 16); + ADD_SLIDER(TXT_SLIDE_LR, f2i(8 * Config_mouse_sensitivity[AXIS_LEFTRIGHT-1].fixval), 0, 16); + ADD_SLIDER(TXT_SLIDE_UD, f2i(8 * Config_mouse_sensitivity[AXIS_UPDOWN-1].fixval), 0, 16); + ADD_SLIDER(TXT_BANK_LR, f2i(8 * Config_mouse_sensitivity[AXIS_BANK-1].fixval), 0, 16); + ADD_SLIDER(TXT_THROTTLE, f2i(8 * Config_mouse_sensitivity[AXIS_THROTTLE-1].fixval), 0, 16); do i1 = newmenu_do1(NULL, "Sensitivity", nitems, m, NULL, i1); diff --git a/main/controls.c b/main/controls.c index ff925d94..7e58e109 100644 --- a/main/controls.c +++ b/main/controls.c @@ -467,7 +467,7 @@ void controls_read_all() if (Config_control_joystick.intval) for (i = 0; i < 6; i++) { - temp = fixmul(joy_axis[i], Config_joystick_sensitivity[joy_advaxes[i].intval-1].value); + temp = fixmul(joy_axis[i], Config_joystick_sensitivity[joy_advaxes[i].intval-1].fixval); if (joy_invert[i].intval) analog_control[joy_advaxes[i].intval] -= temp; else @@ -478,17 +478,17 @@ void controls_read_all() //--------- Read Mouse ----------- mouse_get_delta( &dx, &dy, &dz ); - temp = fixmul(dx * FrameTime / 35, Config_mouse_sensitivity[mouse_axes[0].intval-1].value); + temp = fixmul(dx * FrameTime / 35, Config_mouse_sensitivity[mouse_axes[0].intval-1].fixval); if (mouse_invert[0].intval) analog_control[mouse_axes[0].intval] -= temp; else analog_control[mouse_axes[0].intval] += temp; - temp = fixmul(dy * FrameTime / 25, Config_mouse_sensitivity[mouse_axes[1].intval-1].value); + temp = fixmul(dy * FrameTime / 25, Config_mouse_sensitivity[mouse_axes[1].intval-1].fixval); if (mouse_invert[1].intval) analog_control[mouse_axes[1].intval] -= temp; else analog_control[mouse_axes[1].intval] += temp; - temp = fixmul(dz * FrameTime, Config_mouse_sensitivity[mouse_axes[2].intval-1].value); + temp = fixmul(dz * FrameTime, Config_mouse_sensitivity[mouse_axes[2].intval-1].fixval); if (mouse_invert[2].intval) analog_control[mouse_axes[2].intval] -= temp; else diff --git a/main/cvar.c b/main/cvar.c index cda20487..a0c8e786 100644 --- a/main/cvar.c +++ b/main/cvar.c @@ -122,7 +122,7 @@ void cvar_registervariable(cvar_t *cvar) stringval = cvar->string; cvar->string = d_strdup(stringval); - cvar->value = fl2f(strtod(cvar->string, NULL)); + cvar->fixval = fl2f(strtod(cvar->string, NULL)); cvar->intval = (int)strtol(cvar->string, NULL, 10); if (cvar_find(cvar->name)) @@ -146,7 +146,7 @@ void cvar_set_cvar(cvar_t *cvar, char *value) d_free(cvar->string); cvar->string = d_strdup(value); - cvar->value = fl2f(strtod(cvar->string, NULL)); + cvar->fixval = fl2f(strtod(cvar->string, NULL)); cvar->intval = (int)strtol(cvar->string, NULL, 10); con_printf(CON_VERBOSE, "%s: %s\n", cvar->name, cvar->string); } diff --git a/main/cvar.h b/main/cvar.h index 9224adba..c0cb9e4f 100644 --- a/main/cvar.h +++ b/main/cvar.h @@ -28,7 +28,7 @@ typedef struct cvar_s { const char *name; char *string; ushort flags; - fix value; + fix fixval; int intval; } cvar_t; diff --git a/main/game.c b/main/game.c index da40ac0b..6b3cab62 100644 --- a/main/game.c +++ b/main/game.c @@ -1942,15 +1942,15 @@ void game() ExtGameStatus=GAMESTAT_RUNNING; GameLoop( 1, 1 ); // Do game loop with rendering and reading controls. - if (oldfov != cg_fov.value) + if (oldfov != cg_fov.fixval) { - oldfov = cg_fov.value; - if (cg_fov.value < F1_0) + oldfov = cg_fov.fixval; + if (cg_fov.fixval < F1_0) cvar_setint(&cg_fov, 1); - if (cg_fov.value > 170 * F1_0) + if (cg_fov.fixval > 170 * F1_0) cvar_setint(&cg_fov, 170); - Render_zoom = cg_fov.value * M_PI / 180; // convert to radians - con_printf(CON_VERBOSE, "FOV set to %f (0x%08x)\n", f2fl(cg_fov.value), Render_zoom); + Render_zoom = cg_fov.fixval * M_PI / 180; // convert to radians + con_printf(CON_VERBOSE, "FOV set to %f (0x%08x)\n", f2fl(cg_fov.fixval), Render_zoom); } //if the player is taking damage, give up guided missile control -- 2.39.2