From 58639201051e3e1cf84985c962381523cdf5c37e Mon Sep 17 00:00:00 2001
From: "Zed A. Shaw" <zed.shaw@gmail.com>
Date: Fri, 27 Feb 2026 11:28:56 -0500
Subject: [PATCH] Combat is now working.

---
 src/boss/fight.hpp          | 2 +-
 src/boss/system.cpp         | 2 +-
 src/{ => combat}/battle.cpp | 2 +-
 src/{ => combat}/battle.hpp | 0
 src/{ => combat}/combat.cpp | 0
 src/meson.build             | 8 +++-----
 src/systems.cpp             | 2 +-
 tests/battle.cpp            | 2 +-
 8 files changed, 8 insertions(+), 10 deletions(-)
 rename src/{ => combat}/battle.cpp (99%)
 rename src/{ => combat}/battle.hpp (100%)
 rename src/{ => combat}/combat.cpp (100%)

diff --git a/src/boss/fight.hpp b/src/boss/fight.hpp
index 1c1b03f..6105fbb 100644
--- a/src/boss/fight.hpp
+++ b/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>
diff --git a/src/boss/system.cpp b/src/boss/system.cpp
index 09021c3..35bd422 100644
--- a/src/boss/system.cpp
+++ b/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;
diff --git a/src/battle.cpp b/src/combat/battle.cpp
similarity index 99%
rename from src/battle.cpp
rename to src/combat/battle.cpp
index a4fc824..a71020f 100644
--- a/src/battle.cpp
+++ b/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) {
diff --git a/src/battle.hpp b/src/combat/battle.hpp
similarity index 100%
rename from src/battle.hpp
rename to src/combat/battle.hpp
diff --git a/src/combat.cpp b/src/combat/combat.cpp
similarity index 100%
rename from src/combat.cpp
rename to src/combat/combat.cpp
diff --git a/src/meson.build b/src/meson.build
index d64d74e..1f4f7da 100644
--- a/src/meson.build
+++ b/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',
diff --git a/src/systems.cpp b/src/systems.cpp
index 9e0accf..a4bc344 100644
--- a/src/systems.cpp
+++ b/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"
diff --git a/tests/battle.cpp b/tests/battle.cpp
index 82ed91e..3f9d34a 100644
--- a/tests/battle.cpp
+++ b/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"