From 737f01fae049c531f2e47263b2e8e1a04e7fa2f6 Mon Sep 17 00:00:00 2001
From: Sally Coolatta <tehrealsalt@gmail.com>
Date: Mon, 10 Aug 2020 17:04:02 -0400
Subject: [PATCH] Move axis_input_e to g_game.h

---
 src/g_game.c | 17 -----------------
 src/g_game.h | 17 +++++++++++++++++
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/src/g_game.c b/src/g_game.c
index 1ae855236..15860b94d 100644
--- a/src/g_game.c
+++ b/src/g_game.c
@@ -403,23 +403,6 @@ consvar_t cv_resetspecialmusic = {"resetspecialmusic", "Yes", CV_SAVE, CV_YesNo,
 
 consvar_t cv_resume = {"resume", "Yes", CV_SAVE, CV_YesNo, NULL, 0, NULL, NULL, 0, 0, NULL};
 
-typedef enum
-{
-	AXISNONE = 0,
-
-	AXISTURN,
-	AXISMOVE,
-	AXISBRAKE,
-	AXISAIM,
-	AXISLOOK,
-
-	AXISDIGITAL, // axes below this use digital deadzone
-
-	AXISFIRE = AXISDIGITAL,
-	AXISDRIFT,
-	AXISLOOKBACK,
-} axis_input_e;
-
 consvar_t cv_turnaxis[MAXSPLITSCREENPLAYERS] = {
 	{"joyaxis_turn", "X-Axis", CV_SAVE, joyaxis_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL},
 	{"joyaxis2_turn", "X-Axis", CV_SAVE, joyaxis_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL},
diff --git a/src/g_game.h b/src/g_game.h
index 23e8ef1e9..1885b48ae 100644
--- a/src/g_game.h
+++ b/src/g_game.h
@@ -94,6 +94,23 @@ ticcmd_t *G_MoveTiccmd(ticcmd_t* dest, const ticcmd_t* src, const size_t n);
 INT16 G_ClipAimingPitch(INT32 *aiming);
 INT16 G_SoftwareClipAimingPitch(INT32 *aiming);
 
+typedef enum
+{
+	AXISNONE = 0,
+
+	AXISTURN,
+	AXISMOVE,
+	AXISBRAKE,
+	AXISAIM,
+	AXISLOOK,
+
+	AXISDIGITAL, // axes below this use digital deadzone
+
+	AXISFIRE = AXISDIGITAL,
+	AXISDRIFT,
+	AXISLOOKBACK,
+} axis_input_e;
+
 INT32 PlayerJoyAxis(UINT8 player, axis_input_e axissel);
 
 extern angle_t localangle[MAXSPLITSCREENPLAYERS];