Combat is now working.

src/boss/fight.hpp

@@ -4,7 +4,7 @@
 #include "dinkyecs.hpp"
 #include "boss/ui.hpp"
 #include "events.hpp"
-#include "battle.hpp"
+#include "combat/battle.hpp"
 #include "gui/event_router.hpp"
 #include <memory>
 #include <any>

src/boss/system.cpp

@@ -3,7 +3,7 @@
 #include "components.hpp"
 #include "game_level.hpp"
 #include "ai/ai.hpp"
-#include "battle.hpp"
+#include "combat/battle.hpp"
 
 namespace boss {
   using namespace components;

src/combat/battle.cpp

@@ -1,5 +1,5 @@
 #include "rituals.hpp"
-#include "battle.hpp"
+#include "combat/battle.hpp"
 
 namespace combat {
   void BattleEngine::add_enemy(Combatant enemy) {

src/meson.build

@@ -5,8 +5,8 @@ sources = files(
   'ai/goap.cpp',
 
   # combat
-  'battle.cpp',
-  'combat.cpp',
+  'combat/battle.cpp',
+  'combat/combat.cpp',
 
   # boss fight mini game
   'boss/fight.cpp',
@@ -32,9 +32,6 @@ sources = files(
   # cutscenes
   'storyboard/ui.cpp',
 
-  # sound
-  'sound.cpp',
-
   # graphics
   'textures.cpp',
   'palette.cpp',
@@ -64,6 +61,7 @@ sources = files(
   'game_level.cpp',
   'config.cpp',
   'map.cpp',
+  'sound.cpp',
 
   # root
   'dbc.cpp',

src/systems.cpp

@@ -12,7 +12,7 @@
 #include "ai/ai_debug.hpp"
 #include "shiterator.hpp"
 #include "rituals.hpp"
-#include "battle.hpp"
+#include "combat/battle.hpp"
 #include <iostream>
 #include "shaders.hpp"
 #include "inventory.hpp"

tests/battle.cpp

@@ -2,7 +2,7 @@
 #include <iostream>
 #include <set>
 #include "rituals.hpp"
-#include "battle.hpp"
+#include "combat/battle.hpp"
 #include "simplefsm.hpp"
 #include "dinkyecs.hpp"
 #include "boss/system.hpp"