From 3bcc9514ab798f5ed3183a2ab6668fc88a8e2e76 Mon Sep 17 00:00:00 2001
From: Kenix3 <kenixwhisperwind@gmail.com>
Date: Wed, 10 Aug 2022 18:29:14 -0400
Subject: [PATCH] Cleanup ControlDeck class

---
 libultraship/libultraship/ControlDeck.cpp | 6 +++++-
 libultraship/libultraship/ControlDeck.h   | 4 +++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/libultraship/libultraship/ControlDeck.cpp b/libultraship/libultraship/ControlDeck.cpp
index 7437afeee..59f25b44f 100644
--- a/libultraship/libultraship/ControlDeck.cpp
+++ b/libultraship/libultraship/ControlDeck.cpp
@@ -9,7 +9,6 @@
 #include "Cvar.h"
 
 namespace Ship {
-    uint8_t* controllerBits;
 
     void ControlDeck::Init(uint8_t* bits) {
         ScanPhysicalDevices();
@@ -187,4 +186,9 @@ namespace Ship {
     std::shared_ptr<Controller> ControlDeck::GetPhysicalDeviceFromVirtualSlot(int slot) {
         return GetPhysicalDevice(GetVirtualDevice(slot));
     }
+
+    uint8_t* ControlDeck::GetControllerBits() {
+        return controllerBits;
+    }
+
 }
\ No newline at end of file
diff --git a/libultraship/libultraship/ControlDeck.h b/libultraship/libultraship/ControlDeck.h
index 15cba08e9..025bfcde4 100644
--- a/libultraship/libultraship/ControlDeck.h
+++ b/libultraship/libultraship/ControlDeck.h
@@ -18,8 +18,10 @@ namespace Ship {
 		size_t GetNumPhysicalDevices();
 		int GetVirtualDevice(int slot);
 		size_t GetNumVirtualDevices();
+		uint8_t* GetControllerBits();
 	private:
-		std::vector<int> virtualDevices;
+		std::vector<int> virtualDevices = {};
 		std::vector<std::shared_ptr<Controller>> physicalDevices = {};
+		uint8_t* controllerBits = nullptr;
 	};
 }