From 02cdab009e8c28ec0a4f79ba7910ae379078f69f Mon Sep 17 00:00:00 2001
From: "C. J. Howard" <cjhoward@cjhoward.org>
Date: Mon, 25 Jan 2021 23:23:03 +0800
Subject: [PATCH] Move cart namespace out of game folder

---
 CMakeLists.txt                                | 1 -
 src/{game/cartography => cart}/cart.hpp       | 0
 src/{game/cartography => cart}/relief-map.cpp | 0
 src/{game/cartography => cart}/relief-map.hpp | 0
 src/ecs/systems/terrain-system.cpp            | 2 +-
 src/input/listener.cpp                        | 2 +-
 6 files changed, 2 insertions(+), 3 deletions(-)
 rename src/{game/cartography => cart}/cart.hpp (100%)
 rename src/{game/cartography => cart}/relief-map.cpp (100%)
 rename src/{game/cartography => cart}/relief-map.hpp (100%)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index bc40e61..d4aa351 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -14,7 +14,6 @@ find_package(SDL2 REQUIRED COMPONENTS SDL2::SDL2-static SDL2::SDL2main CONFIG)
 find_package(OpenAL REQUIRED CONFIG)
 find_library(physfs REQUIRED NAMES physfs-static PATHS "${CMAKE_PREFIX_PATH}/lib")
 
-
 # Determine dependencies
 set(STATIC_LIBS
 	dr_wav
diff --git a/src/game/cartography/cart.hpp b/src/cart/cart.hpp
similarity index 100%
rename from src/game/cartography/cart.hpp
rename to src/cart/cart.hpp
diff --git a/src/game/cartography/relief-map.cpp b/src/cart/relief-map.cpp
similarity index 100%
rename from src/game/cartography/relief-map.cpp
rename to src/cart/relief-map.cpp
diff --git a/src/game/cartography/relief-map.hpp b/src/cart/relief-map.hpp
similarity index 100%
rename from src/game/cartography/relief-map.hpp
rename to src/cart/relief-map.hpp
diff --git a/src/ecs/systems/terrain-system.cpp b/src/ecs/systems/terrain-system.cpp
index ceb610c..7261fa8 100644
--- a/src/ecs/systems/terrain-system.cpp
+++ b/src/ecs/systems/terrain-system.cpp
@@ -21,7 +21,7 @@
 #include "ecs/components/model-component.hpp"
 #include "ecs/components/collision-component.hpp"
 #include "ecs/components/transform-component.hpp"
-#include "game/cartography/relief-map.hpp"
+#include "cart/relief-map.hpp"
 #include "renderer/model.hpp"
 #include "geom/mesh.hpp"
 #include "geom/mesh-functions.hpp"
diff --git a/src/input/listener.cpp b/src/input/listener.cpp
index 1538aab..5707e21 100644
--- a/src/input/listener.cpp
+++ b/src/input/listener.cpp
@@ -33,7 +33,7 @@ listener::~listener()
 	set_event_dispatcher(nullptr);
 }
 
-void listener::set_event_dispatcher(event_dispatcher* event_dispatcher)
+void listener::set_event_dispatcher(::event_dispatcher* event_dispatcher)
 {
 	if (this->event_dispatcher)
 	{