diff --git a/src/ai/goap.cpp b/src/ai/goap.cpp index 6048af2..19f1dc4 100644 --- a/src/ai/goap.cpp +++ b/src/ai/goap.cpp @@ -1,7 +1,7 @@ #include "dbc.hpp" #include "goap.hpp" #include "ai_debug.hpp" -#include "stats.hpp" +#include "algos/stats.hpp" #include // #define DEBUG_CYCLES 1 diff --git a/src/maze.cpp b/src/algos/maze.cpp similarity index 99% rename from src/maze.cpp rename to src/algos/maze.cpp index 035b395..5b8d6d9 100644 --- a/src/maze.cpp +++ b/src/algos/maze.cpp @@ -1,8 +1,8 @@ #include #include -#include "rand.hpp" +#include "algos/rand.hpp" #include "constants.hpp" -#include "maze.hpp" +#include "algos/maze.hpp" using std::string; using matrix::Matrix; diff --git a/src/maze.hpp b/src/algos/maze.hpp similarity index 100% rename from src/maze.hpp rename to src/algos/maze.hpp diff --git a/src/pathing.cpp b/src/algos/pathing.cpp similarity index 99% rename from src/pathing.cpp rename to src/algos/pathing.cpp index b21c4cb..73954ae 100644 --- a/src/pathing.cpp +++ b/src/algos/pathing.cpp @@ -1,5 +1,5 @@ #include "constants.hpp" -#include "pathing.hpp" +#include "algos/pathing.hpp" #include "dbc.hpp" #include diff --git a/src/pathing.hpp b/src/algos/pathing.hpp similarity index 100% rename from src/pathing.hpp rename to src/algos/pathing.hpp diff --git a/src/rand.cpp b/src/algos/rand.cpp similarity index 90% rename from src/rand.cpp rename to src/algos/rand.cpp index 0b3e9fb..31aaa96 100644 --- a/src/rand.cpp +++ b/src/algos/rand.cpp @@ -1,4 +1,4 @@ -#include "rand.hpp" +#include "algos/rand.hpp" namespace Random { std::random_device RNG; diff --git a/src/rand.hpp b/src/algos/rand.hpp similarity index 100% rename from src/rand.hpp rename to src/algos/rand.hpp diff --git a/src/spatialmap.cpp b/src/algos/spatialmap.cpp similarity index 99% rename from src/spatialmap.cpp rename to src/algos/spatialmap.cpp index 8b34998..3ee2a90 100644 --- a/src/spatialmap.cpp +++ b/src/algos/spatialmap.cpp @@ -1,4 +1,4 @@ -#include "spatialmap.hpp" +#include "algos/spatialmap.hpp" #include using namespace fmt; diff --git a/src/spatialmap.hpp b/src/algos/spatialmap.hpp similarity index 100% rename from src/spatialmap.hpp rename to src/algos/spatialmap.hpp diff --git a/src/stats.cpp b/src/algos/stats.cpp similarity index 90% rename from src/stats.cpp rename to src/algos/stats.cpp index 36f5a6e..ca97211 100644 --- a/src/stats.cpp +++ b/src/algos/stats.cpp @@ -1,4 +1,4 @@ -#include "stats.hpp" +#include "algos/stats.hpp" #include #include "dbc.hpp" diff --git a/src/stats.hpp b/src/algos/stats.hpp similarity index 100% rename from src/stats.hpp rename to src/algos/stats.hpp diff --git a/src/animation.cpp b/src/animation.cpp index 31330cc..30c8381 100644 --- a/src/animation.cpp +++ b/src/animation.cpp @@ -2,7 +2,7 @@ #include #include #include "dbc.hpp" -#include "rand.hpp" +#include "algos/rand.hpp" #include #include #include "sound.hpp" diff --git a/src/boss/fight.cpp b/src/boss/fight.cpp index d557514..b69d6a7 100644 --- a/src/boss/fight.cpp +++ b/src/boss/fight.cpp @@ -3,7 +3,7 @@ #include "boss/system.hpp" #include "game_level.hpp" #include -#include "rand.hpp" +#include "algos/rand.hpp" #include "events.hpp" namespace boss { diff --git a/src/combat/combat.cpp b/src/combat/combat.cpp index 62b6371..0869b9a 100644 --- a/src/combat/combat.cpp +++ b/src/combat/combat.cpp @@ -1,5 +1,5 @@ #include "components.hpp" -#include "rand.hpp" +#include "algos/rand.hpp" namespace components { int Combat::attack(Combat &target) { diff --git a/src/easing.cpp b/src/easing.cpp index 613d360..d639e44 100644 --- a/src/easing.cpp +++ b/src/easing.cpp @@ -1,4 +1,4 @@ -#include "rand.hpp" +#include "algos/rand.hpp" #include "animation.hpp" #include #include diff --git a/src/game_level.hpp b/src/game_level.hpp index 8fa237a..4617eb3 100644 --- a/src/game_level.hpp +++ b/src/game_level.hpp @@ -5,7 +5,7 @@ #include "lights.hpp" #include "map.hpp" #include -#include "spatialmap.hpp" +#include "algos/spatialmap.hpp" namespace components { struct Position; diff --git a/src/gui/debug_ui.hpp b/src/gui/debug_ui.hpp index 7760acb..5f79929 100644 --- a/src/gui/debug_ui.hpp +++ b/src/gui/debug_ui.hpp @@ -3,7 +3,7 @@ #include #include #include -#include "stats.hpp" +#include "algos/stats.hpp" namespace gui { class DebugUI { diff --git a/src/gui/main_ui.hpp b/src/gui/main_ui.hpp index 49fe7dd..7093e74 100644 --- a/src/gui/main_ui.hpp +++ b/src/gui/main_ui.hpp @@ -1,7 +1,7 @@ #pragma once #include #include -#include "stats.hpp" +#include "algos/stats.hpp" #include #include "gui/overlay_ui.hpp" #include "gui/debug_ui.hpp" diff --git a/src/gui/map_view.cpp b/src/gui/map_view.cpp index 2792134..eb7c24e 100644 --- a/src/gui/map_view.cpp +++ b/src/gui/map_view.cpp @@ -3,9 +3,9 @@ #include #include "dbc.hpp" #include "components.hpp" -#include "rand.hpp" +#include "algos/rand.hpp" #include "systems.hpp" -#include "rand.hpp" +#include "algos/rand.hpp" #include #include #include diff --git a/src/gui/mini_map.cpp b/src/gui/mini_map.cpp index 4d44a06..f08fe2c 100644 --- a/src/gui/mini_map.cpp +++ b/src/gui/mini_map.cpp @@ -3,9 +3,9 @@ #include #include "dbc.hpp" #include "components.hpp" -#include "rand.hpp" +#include "algos/rand.hpp" #include "systems.hpp" -#include "rand.hpp" +#include "algos/rand.hpp" #include #include #include diff --git a/src/gui/ritual_ui.cpp b/src/gui/ritual_ui.cpp index d80c92f..fb23bf3 100644 --- a/src/gui/ritual_ui.cpp +++ b/src/gui/ritual_ui.cpp @@ -1,6 +1,6 @@ #include "gui/ritual_ui.hpp" #include -#include "rand.hpp" +#include "algos/rand.hpp" #include "sound.hpp" #include "events.hpp" #include "game_level.hpp" diff --git a/src/gui/status_ui.cpp b/src/gui/status_ui.cpp index 9a72967..9afdab6 100644 --- a/src/gui/status_ui.cpp +++ b/src/gui/status_ui.cpp @@ -1,7 +1,7 @@ #include "gui/status_ui.hpp" #include "components.hpp" #include -#include "rand.hpp" +#include "algos/rand.hpp" #include #include "gui/guecstra.hpp" #include "systems.hpp" diff --git a/src/lights.hpp b/src/lights.hpp index 274931a..7a99fd8 100644 --- a/src/lights.hpp +++ b/src/lights.hpp @@ -4,7 +4,7 @@ #include "point.hpp" #include #include "algos/matrix.hpp" -#include "pathing.hpp" +#include "algos/pathing.hpp" #include "components.hpp" namespace lighting { diff --git a/src/map.cpp b/src/map.cpp index 443ad10..3edbc65 100644 --- a/src/map.cpp +++ b/src/map.cpp @@ -1,12 +1,11 @@ #include "map.hpp" #include "dbc.hpp" -#include "rand.hpp" +#include "algos/rand.hpp" #include #include #include #include #include "algos/matrix.hpp" -#include "rand.hpp" using std::vector, std::pair; using namespace fmt; diff --git a/src/map.hpp b/src/map.hpp index 77a9ba9..12bdee1 100644 --- a/src/map.hpp +++ b/src/map.hpp @@ -7,7 +7,7 @@ #include #include "point.hpp" #include "lights.hpp" -#include "pathing.hpp" +#include "algos/pathing.hpp" #include "algos/matrix.hpp" #include "constants.hpp" diff --git a/src/meson.build b/src/meson.build index 761b63c..9e3faf8 100644 --- a/src/meson.build +++ b/src/meson.build @@ -45,11 +45,11 @@ sources = files( # algos 'algos/matrix.cpp', - 'maze.cpp', - 'pathing.cpp', - 'rand.cpp', - 'spatialmap.cpp', - 'stats.cpp', + 'algos/maze.cpp', + 'algos/pathing.cpp', + 'algos/rand.cpp', + 'algos/spatialmap.cpp', + 'algos/stats.cpp', # game 'systems.cpp', diff --git a/src/raycaster.hpp b/src/raycaster.hpp index cf25797..9cc06fb 100644 --- a/src/raycaster.hpp +++ b/src/raycaster.hpp @@ -2,7 +2,7 @@ #include #include -#include "spatialmap.hpp" +#include "algos/spatialmap.hpp" #include "game_level.hpp" #include "textures.hpp" diff --git a/src/shiterator.hpp b/src/shiterator.hpp index c8a8df1..023145f 100644 --- a/src/shiterator.hpp +++ b/src/shiterator.hpp @@ -7,7 +7,7 @@ #include #include #include "point.hpp" -#include "rand.hpp" +#include "algos/rand.hpp" #include "dbc.hpp" /* diff --git a/src/systems.cpp b/src/systems.cpp index a4bc344..beb09ba 100644 --- a/src/systems.cpp +++ b/src/systems.cpp @@ -2,8 +2,8 @@ #include #include #include -#include "rand.hpp" -#include "spatialmap.hpp" +#include "algos/rand.hpp" +#include "algos/spatialmap.hpp" #include "dbc.hpp" #include "lights.hpp" #include "events.hpp" diff --git a/src/systems.hpp b/src/systems.hpp index 3df51cd..b8902d3 100644 --- a/src/systems.hpp +++ b/src/systems.hpp @@ -2,7 +2,7 @@ #include "components.hpp" #include #include "map.hpp" -#include "spatialmap.hpp" +#include "algos/spatialmap.hpp" #include "game_level.hpp" namespace System { diff --git a/src/worldbuilder.cpp b/src/worldbuilder.cpp index 1bf9bb5..e4f1a80 100644 --- a/src/worldbuilder.cpp +++ b/src/worldbuilder.cpp @@ -1,10 +1,10 @@ #include "worldbuilder.hpp" -#include "rand.hpp" +#include "algos/rand.hpp" #include #include #include "components.hpp" #include "rituals.hpp" -#include "maze.hpp" +#include "algos/maze.hpp" #include "textures.hpp" #include "inventory.hpp" #include "systems.hpp" diff --git a/src/worldbuilder.hpp b/src/worldbuilder.hpp index 83023aa..25bc7bf 100644 --- a/src/worldbuilder.hpp +++ b/src/worldbuilder.hpp @@ -3,7 +3,7 @@ #include "map.hpp" #include "dinkyecs.hpp" #include "components.hpp" -#include "spatialmap.hpp" +#include "algos/spatialmap.hpp" class WorldBuilder { public: diff --git a/tests/animation.cpp b/tests/animation.cpp index 6c7fed2..8565f07 100644 --- a/tests/animation.cpp +++ b/tests/animation.cpp @@ -6,7 +6,7 @@ #include #include #include -#include "rand.hpp" +#include "algos/rand.hpp" #include "animation.hpp" #include "sound.hpp" #include "components.hpp" diff --git a/tests/matrix.cpp b/tests/matrix.cpp index a4fdbca..88b36b8 100644 --- a/tests/matrix.cpp +++ b/tests/matrix.cpp @@ -3,7 +3,7 @@ #include #include "config.hpp" #include "algos/matrix.hpp" -#include "rand.hpp" +#include "algos/rand.hpp" #include "game_level.hpp" #include #include diff --git a/tests/mazes.cpp b/tests/mazes.cpp index 24cb9dd..521dab6 100644 --- a/tests/mazes.cpp +++ b/tests/mazes.cpp @@ -2,9 +2,9 @@ #include #include #include "algos/matrix.hpp" -#include "rand.hpp" +#include "algos/rand.hpp" #include "constants.hpp" -#include "maze.hpp" +#include "algos/maze.hpp" using std::string; using matrix::Matrix; diff --git a/tests/pathing.cpp b/tests/pathing.cpp index 318e176..9e65c07 100644 --- a/tests/pathing.cpp +++ b/tests/pathing.cpp @@ -2,13 +2,13 @@ #include #include #include -#include "pathing.hpp" +#include "algos/pathing.hpp" #include "algos/matrix.hpp" #include "ai/ai.hpp" #include "game_level.hpp" #include #include -#include "rand.hpp" +#include "algos/rand.hpp" #include "systems.hpp" using namespace fmt; diff --git a/tests/spatialmap.cpp b/tests/spatialmap.cpp index 7a30745..5702401 100644 --- a/tests/spatialmap.cpp +++ b/tests/spatialmap.cpp @@ -1,9 +1,9 @@ #include #include #include -#include "spatialmap.hpp" +#include "algos/spatialmap.hpp" #include "dinkyecs.hpp" -#include "rand.hpp" +#include "algos/rand.hpp" #include #include diff --git a/tests/stats.cpp b/tests/stats.cpp index 184bc6b..a5783e2 100644 --- a/tests/stats.cpp +++ b/tests/stats.cpp @@ -1,6 +1,6 @@ #include -#include "stats.hpp" -#include "rand.hpp" +#include "algos/stats.hpp" +#include "algos/rand.hpp" #include #include