Browse Source

Move cart namespace out of game folder

master
C. J. Howard 8 months ago
parent
commit
02cdab009e
6 changed files with 2 additions and 3 deletions
  1. +0
    -1
      CMakeLists.txt
  2. +0
    -0
      src/cart/cart.hpp
  3. +0
    -0
      src/cart/relief-map.cpp
  4. +0
    -0
      src/cart/relief-map.hpp
  5. +1
    -1
      src/ecs/systems/terrain-system.cpp
  6. +1
    -1
      src/input/listener.cpp

+ 0
- 1
CMakeLists.txt View File

@ -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

src/game/cartography/cart.hpp → src/cart/cart.hpp View File


src/game/cartography/relief-map.cpp → src/cart/relief-map.cpp View File


src/game/cartography/relief-map.hpp → src/cart/relief-map.hpp View File


+ 1
- 1
src/ecs/systems/terrain-system.cpp View File

@ -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"

+ 1
- 1
src/input/listener.cpp View File

@ -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)
{

Loading…
Cancel
Save