update gyro activation when changing mode

andrei-drexler · Dec 12, 2023 · 209dbfe · 209dbfe
1 parent c74aee0
commit 209dbfe
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 2 deletions.
diff --git a/Quake/in_sdl.c b/Quake/in_sdl.c
@@ -358,31 +358,50 @@ void IN_ShutdownJoystick (void)
 	SDL_QuitSubSystem(SDL_INIT_GAMECONTROLLER);
 }
 
-void IN_GyroActionDown (void) {
+void IN_GyroActionDown (void)
+{
 	switch ((int)gyro_mode.value)
 	{
 		case 1:
 			gyro_active = true;
 			return;
 		case 2:
 			gyro_active = false;
+			return;
 		case 4:
 			gyro_dir = -1;
 	}
 }
-void IN_GyroActionUp (void) {
+void IN_GyroActionUp (void)
+{
 	switch ((int)gyro_mode.value)
 	{
 		case 1:
 			gyro_active = false;
 			return;
 		case 2:
 			gyro_active = true;
+			return;
 		case 4:
 			gyro_dir = 1;
 	}
 }
 
+void IN_UpdateGyroActive(void)
+{
+	switch ((int)gyro_mode.value)
+	{
+		case 0:
+		case 1:
+			gyro_active = false;
+			return;
+		case 2:
+		case 3:
+		case 4:
+			gyro_active = true;
+	}
+}
+
 void IN_Init (void)
 {
 	textmode = Key_TextEntry();

diff --git a/Quake/menu.c b/Quake/menu.c
@@ -66,6 +66,7 @@ extern qboolean quake64;
 
 extern void StartCalibration(void);
 extern qboolean IsCalibrationZero(void);
+extern void IN_UpdateGyroActive(void);
 
 enum m_state_e m_state;
 extern qboolean	keydown[256];
@@ -3073,6 +3074,7 @@ static void GYRO_Menu_ChooseNextMode (int dir)
 		i = 0;
 
 	Cvar_SetValueQuick (&gyro_mode, i);
+	IN_UpdateGyroActive();
 }
 
 /*