From 5f59b752c0eeeb39d4be14aaeddc936964bf97f6 Mon Sep 17 00:00:00 2001 From: Jaime Moreira Date: Sat, 30 Jul 2022 14:29:38 -0400 Subject: [PATCH] Scope fixed for some cvars Old sliders required some of their associated cvars to be "extern" so their current value could be read. That's no longer needed, so they are "static" now. --- src/client/header/client.h | 9 --------- src/client/input/sdl.c | 18 +++++++++--------- 2 files changed, 9 insertions(+), 18 deletions(-) diff --git a/src/client/header/client.h b/src/client/header/client.h index 6bc13c55..0b7a8dbf 100644 --- a/src/client/header/client.h +++ b/src/client/header/client.h @@ -294,17 +294,8 @@ extern cvar_t *cl_shownet; extern cvar_t *cl_showmiss; extern cvar_t *cl_showclamp; extern cvar_t *lookstrafe; -extern cvar_t *sensitivity; -extern cvar_t *joy_expo; -extern cvar_t *joy_yawsensitivity; -extern cvar_t *joy_pitchsensitivity; -extern cvar_t *joy_forwardsensitivity; -extern cvar_t *joy_sidesensitivity; -extern cvar_t *joy_upsensitivity; extern cvar_t *gyro_mode; extern cvar_t *gyro_turning_axis; -extern cvar_t *gyro_yawsensitivity; -extern cvar_t *gyro_pitchsensitivity; extern cvar_t *m_pitch; extern cvar_t *m_yaw; extern cvar_t *m_forward; diff --git a/src/client/input/sdl.c b/src/client/input/sdl.c index 75f479c4..ed1972bc 100644 --- a/src/client/input/sdl.c +++ b/src/client/input/sdl.c @@ -79,7 +79,7 @@ cvar_t *m_pitch; cvar_t *m_side; cvar_t *m_up; cvar_t *m_yaw; -cvar_t *sensitivity; +static cvar_t *sensitivity; static cvar_t *exponential_speedup; static cvar_t *in_grab; @@ -114,12 +114,12 @@ static int last_haptic_efffect_pos = 0; static struct hapric_effects_cache last_haptic_efffect[HAPTIC_EFFECT_LIST_SIZE]; // Joystick sensitivity -cvar_t *joy_yawsensitivity; -cvar_t *joy_pitchsensitivity; -cvar_t *joy_forwardsensitivity; -cvar_t *joy_sidesensitivity; -cvar_t *joy_upsensitivity; -cvar_t *joy_expo; +static cvar_t *joy_yawsensitivity; +static cvar_t *joy_pitchsensitivity; +static cvar_t *joy_forwardsensitivity; +static cvar_t *joy_sidesensitivity; +static cvar_t *joy_upsensitivity; +static cvar_t *joy_expo; // Joystick direction settings static cvar_t *joy_axis_leftx; @@ -145,8 +145,8 @@ cvar_t *gyro_mode; cvar_t *gyro_turning_axis; // yaw or roll // Gyro sensitivity -cvar_t *gyro_yawsensitivity; -cvar_t *gyro_pitchsensitivity; +static cvar_t *gyro_yawsensitivity; +static cvar_t *gyro_pitchsensitivity; // Gyro availability qboolean gyro_hardware = false;