From 9d0487c8ce05f567467f43b41e7f2bdc56876814 Mon Sep 17 00:00:00 2001
From: Tristan 'Natrist' Cormier <natrist@users.noreply.github.com>
Date: Sun, 2 Apr 2023 06:06:40 -0700
Subject: [PATCH] chore(console): move console functions out of client

---
 src/client/Client.cpp                          | 8 ++++----
 src/console/CMakeLists.txt                     | 2 ++
 src/{client/Console.cpp => console/Client.cpp} | 4 ++--
 src/{client/Console.hpp => console/Client.hpp} | 4 ++--
 4 files changed, 10 insertions(+), 8 deletions(-)
 rename src/{client/Console.cpp => console/Client.cpp} (99%)
 rename src/{client/Console.hpp => console/Client.hpp} (80%)

diff --git a/src/client/Client.cpp b/src/client/Client.cpp
index bebdea2..1660948 100644
--- a/src/client/Client.cpp
+++ b/src/client/Client.cpp
@@ -1,8 +1,9 @@
 #include "client/Client.hpp"
-#include "client/ClientServices.hpp"
-#include "client/Console.hpp"
-#include "db/Db.hpp"
 #include "async/AsyncFile.hpp"
+#include "client/ClientServices.hpp"
+#include "console/CVar.hpp"
+#include "console/Client.hpp"
+#include "db/Db.hpp"
 #include "glue/CGlueMgr.hpp"
 #include "gx/Screen.hpp"
 #include "gx/Texture.hpp"
@@ -10,7 +11,6 @@
 #include "net/Poll.hpp"
 #include "ui/FrameScript.hpp"
 #include "ui/FrameXML.hpp"
-#include "console/CVar.hpp"
 #include "world/World.hpp"
 #include <bc/Debug.hpp>
 #include <common/Prop.hpp>
diff --git a/src/console/CMakeLists.txt b/src/console/CMakeLists.txt
index 5d6d09d..e4c6af1 100644
--- a/src/console/CMakeLists.txt
+++ b/src/console/CMakeLists.txt
@@ -15,4 +15,6 @@ target_link_libraries(console
     PUBLIC
         common
         storm
+    PRIVATE
+        client
 )
diff --git a/src/client/Console.cpp b/src/console/Client.cpp
similarity index 99%
rename from src/client/Console.cpp
rename to src/console/Client.cpp
index 93edabb..376a92c 100644
--- a/src/client/Console.cpp
+++ b/src/console/Client.cpp
@@ -1,8 +1,8 @@
-#include "client/Console.hpp"
+#include "console/Client.hpp"
 #include "client/Gui.hpp"
+#include "console/CVar.hpp"
 #include "event/Input.hpp"
 #include "gx/Device.hpp"
-#include "console/CVar.hpp"
 #include <cstring>
 
 CVar* s_cvGxMaximize;
diff --git a/src/client/Console.hpp b/src/console/Client.hpp
similarity index 80%
rename from src/client/Console.hpp
rename to src/console/Client.hpp
index a54f82d..20540d3 100644
--- a/src/client/Console.hpp
+++ b/src/console/Client.hpp
@@ -1,5 +1,5 @@
-#ifndef CLIENT_CONSOLE_HPP
-#define CLIENT_CONSOLE_HPP
+#ifndef CONSOLE_CLIENT_HPP
+#define CONSOLE_CLIENT_HPP
 
 #include "gx/CGxFormat.hpp"