From 13cb52a0db144b2ce328075aecf5c0bda7137d55 Mon Sep 17 00:00:00 2001
From: Mitchell Richters <mjr4077au@gmail.com>
Date: Fri, 31 Mar 2023 00:28:41 +1100
Subject: [PATCH] - Move `HIDInput` struct from `inputstate.h` to
 `gameinput.h`.

---
 source/core/gameinput.h  | 5 +++++
 source/core/gamestruct.h | 1 +
 source/core/inputstate.h | 8 --------
 3 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/source/core/gameinput.h b/source/core/gameinput.h
index 77d403ee4..85a4c4580 100644
--- a/source/core/gameinput.h
+++ b/source/core/gameinput.h
@@ -83,6 +83,11 @@ private:
 class FSerializer;
 FSerializer& Serialize(FSerializer& arc, const char* keyname, PlayerAngles& w, PlayerAngles* def);
 
+struct HIDInput
+{
+	float       joyaxes[NUM_JOYAXIS];
+	FVector2    mouse;
+};
 
 void clearLocalInputBuffer();
 void processVehicleInput(HIDInput* const hidInput, InputPacket* const currInput, const double scaleAdjust, const float baseVel, const float velScale, const bool canMove, const bool canTurn, const bool attenuate);
diff --git a/source/core/gamestruct.h b/source/core/gamestruct.h
index 28166d107..1104bcc1e 100644
--- a/source/core/gamestruct.h
+++ b/source/core/gamestruct.h
@@ -18,6 +18,7 @@ struct tspritetype;
 class DCoreActor;
 struct MapRecord;
 struct PlayerAngles;
+struct HIDInput;
 
 void processMovement(HIDInput* const hidInput, InputPacket* const currInput, const double scaleAdjust, const int drink_amt = 0, const bool allowstrafe = true, const double turnscale = 1.);
 
diff --git a/source/core/inputstate.h b/source/core/inputstate.h
index 2c983ebec..302661fc1 100644
--- a/source/core/inputstate.h
+++ b/source/core/inputstate.h
@@ -13,14 +13,6 @@
 #include "packet.h"
 #include "vectors.h"
 
-
-struct HIDInput
-{
-	float       joyaxes[NUM_JOYAXIS];
-	FVector2    mouse;
-};
-
-
 class InputState
 {
 	uint8_t KeyStatus[NUM_KEYS];