From ee51e76795d99fa110415f779aa7e75a781d4502 Mon Sep 17 00:00:00 2001
From: superp00t <superp00t@tutanota.com>
Date: Wed, 16 Aug 2023 17:38:37 -0400
Subject: [PATCH] fix(console): new types included

---
 src/console/Line.hpp  | 14 --------------
 src/console/Types.hpp | 17 +++++++++++------
 2 files changed, 11 insertions(+), 20 deletions(-)

diff --git a/src/console/Line.hpp b/src/console/Line.hpp
index 625b1d9..f0419a3 100644
--- a/src/console/Line.hpp
+++ b/src/console/Line.hpp
@@ -2,7 +2,6 @@
 #define CONSOLE_LINE_HPP
 
 #include "console/Types.hpp"
-#include "gx/Font.hpp"
 
 #include <storm/List.hpp>
 
@@ -10,19 +9,6 @@
 #define CONSOLE_LINE_LENGTH 1024
 #define CONSOLE_LINE_PREALLOC 16
 
-class CONSOLELINE : public TSLinkedNode<CONSOLELINE> {
-    public:
-        char* buffer;
-        uint32_t chars;
-        uint32_t charsalloc;
-        uint32_t inputpos;
-        uint32_t inputstart;
-        COLOR_T colorType;
-        CGxString* fontPointer;
-
-        ~CONSOLELINE();
-};
-
 void ConsoleWrite(const char* str, COLOR_T color);
 void ConsoleWriteA(const char* str, COLOR_T color, ...);
 
diff --git a/src/console/Types.hpp b/src/console/Types.hpp
index c497a60..132407b 100644
--- a/src/console/Types.hpp
+++ b/src/console/Types.hpp
@@ -1,6 +1,11 @@
 #ifndef CONSOLE_TYPES_HPP
 #define CONSOLE_TYPES_HPP
 
+#include "gx/Font.hpp"
+
+#include <storm/Hash.hpp>
+#include <storm/List.hpp>
+
 enum COLOR_T {
     DEFAULT_COLOR,
     INPUT_COLOR,
@@ -45,12 +50,12 @@ class CONSOLECOMMAND : public TSHashObject<CONSOLECOMMAND, HASHKEY_STRI> {
 
 class CONSOLELINE : public TSLinkedNode<CONSOLELINE> {
     public:
-        char* buffer;
-        uint32_t chars;
-        uint32_t charsalloc;
-        uint32_t inputpos;
-        uint32_t inputstart;
-        COLOR_T colorType;
+        char*      buffer;
+        uint32_t   chars;
+        uint32_t   charsalloc;
+        uint32_t   inputpos;
+        uint32_t   inputstart;
+        COLOR_T    colorType;
         CGxString* fontPointer;
 
         ~CONSOLELINE();