moure source/scenes a source/game/scenes

.clang-tidy

@@ -12,7 +12,7 @@ Checks:
 
 WarningsAsErrors: '*'
 # Headers nostres (excloem source/external/ que conté dependències de tercers no editables)
-HeaderFilterRegex: 'source/(core|game|scenes|utils)/'
+HeaderFilterRegex: 'source/(core|game|utils)/'
 FormatStyle: file
 
 CheckOptions:

CMakeLists.txt

@@ -79,23 +79,23 @@ set(APP_SOURCES
     source/core/system/director.cpp
 
     # Scenes (cinemàtiques i menús reescrits)
-    source/scenes/timeline.cpp
+    source/game/scenes/timeline.cpp
-    source/scenes/sprite_mover.cpp
+    source/game/scenes/sprite_mover.cpp
-    source/scenes/frame_animator.cpp
+    source/game/scenes/frame_animator.cpp
-    source/scenes/palette_fade.cpp
+    source/game/scenes/palette_fade.cpp
-    source/scenes/surface_handle.cpp
+    source/game/scenes/surface_handle.cpp
-    source/scenes/scene_registry.cpp
+    source/game/scenes/scene_registry.cpp
-    source/scenes/scene_utils.cpp
+    source/game/scenes/scene_utils.cpp
-    source/scenes/boot_loader_scene.cpp
+    source/game/scenes/boot_loader_scene.cpp
-    source/scenes/mort_scene.cpp
+    source/game/scenes/mort_scene.cpp
-    source/scenes/banner_scene.cpp
+    source/game/scenes/banner_scene.cpp
-    source/scenes/menu_scene.cpp
+    source/game/scenes/menu_scene.cpp
-    source/scenes/intro_new_logo_scene.cpp
+    source/game/scenes/intro_new_logo_scene.cpp
-    source/scenes/intro_scene.cpp
+    source/game/scenes/intro_scene.cpp
-    source/scenes/intro_sprites_scene.cpp
+    source/game/scenes/intro_sprites_scene.cpp
-    source/scenes/slides_scene.cpp
+    source/game/scenes/slides_scene.cpp
-    source/scenes/credits_scene.cpp
+    source/game/scenes/credits_scene.cpp
-    source/scenes/secreta_scene.cpp
+    source/game/scenes/secreta_scene.cpp
 
     # Game
     source/game/options.cpp

source/core/system/director.cpp

@@ -20,17 +20,17 @@
 #include "game/info.hpp"
 #include "game/modulegame.hpp"
 #include "game/options.hpp"
-#include "scenes/banner_scene.hpp"
+#include "game/scenes/banner_scene.hpp"
-#include "scenes/boot_loader_scene.hpp"
+#include "game/scenes/boot_loader_scene.hpp"
-#include "scenes/credits_scene.hpp"
+#include "game/scenes/credits_scene.hpp"
-#include "scenes/intro_new_logo_scene.hpp"
+#include "game/scenes/intro_new_logo_scene.hpp"
-#include "scenes/intro_scene.hpp"
+#include "game/scenes/intro_scene.hpp"
-#include "scenes/menu_scene.hpp"
+#include "game/scenes/menu_scene.hpp"
-#include "scenes/mort_scene.hpp"
+#include "game/scenes/mort_scene.hpp"
-#include "scenes/scene.hpp"
+#include "game/scenes/scene.hpp"
-#include "scenes/scene_registry.hpp"
+#include "game/scenes/scene_registry.hpp"
-#include "scenes/secreta_scene.hpp"
+#include "game/scenes/secreta_scene.hpp"
-#include "scenes/slides_scene.hpp"
+#include "game/scenes/slides_scene.hpp"
 
 // Cheats del joc original — declarats a jinput.cpp
 extern void JI_moveCheats(Uint8 new_key);

source/core/system/director.hpp

@@ -6,7 +6,7 @@
 #include <cstdint>
 #include <memory>
 
-#include "scenes/scene.hpp"
+#include "game/scenes/scene.hpp"
 
 // El Director és l'únic thread del runtime. Cada iterate() fa input →
 // tick de l'escena actual → JD8_Flip → overlay → present → sleep al frame

source/game/modulegame.hpp

@@ -9,8 +9,8 @@
 #include "game/marcador.hpp"
 #include "game/momia.hpp"
 #include "game/prota.hpp"
-#include "scenes/palette_fade.hpp"
+#include "game/scenes/palette_fade.hpp"
-#include "scenes/scene.hpp"
+#include "game/scenes/scene.hpp"
 
 // Escena de gameplay pur. Reemplaça el vell `Go()` bloquejant amb
 // l'interfície `scenes::Scene` tick-based: `onEnter()` arranca la

source/game/scenes/banner_scene.cpp

@@ -1,4 +1,4 @@
-#include "scenes/banner_scene.hpp"
+#include "game/scenes/banner_scene.hpp"
 
 #include <cstdlib>
 
@@ -6,7 +6,7 @@
 #include "core/jail/jdraw8.hpp"
 #include "core/jail/jinput.hpp"
 #include "game/info.hpp"
-#include "scenes/scene_utils.hpp"
+#include "game/scenes/scene_utils.hpp"
 
 namespace scenes {
 

source/game/scenes/banner_scene.hpp

@@ -1,8 +1,8 @@
 #pragma once
 
-#include "scenes/palette_fade.hpp"
+#include "game/scenes/palette_fade.hpp"
-#include "scenes/scene.hpp"
+#include "game/scenes/scene.hpp"
-#include "scenes/surface_handle.hpp"
+#include "game/scenes/surface_handle.hpp"
 
 namespace scenes {
 

source/game/scenes/boot_loader_scene.cpp

@@ -1,4 +1,4 @@
-#include "scenes/boot_loader_scene.hpp"
+#include "game/scenes/boot_loader_scene.hpp"
 
 #include "core/jail/jdraw8.hpp"
 #include "core/resources/resource_cache.hpp"

source/game/scenes/boot_loader_scene.hpp

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "scenes/scene.hpp"
+#include "game/scenes/scene.hpp"
 
 namespace scenes {
 

source/game/scenes/credits_scene.cpp

@@ -1,4 +1,4 @@
-#include "scenes/credits_scene.hpp"
+#include "game/scenes/credits_scene.hpp"
 
 #include <cstdio>
 #include <cstdlib>
@@ -7,7 +7,7 @@
 #include "core/jail/jdraw8.hpp"
 #include "core/jail/jinput.hpp"
 #include "game/info.hpp"
-#include "scenes/scene_utils.hpp"
+#include "game/scenes/scene_utils.hpp"
 
 namespace {
 

source/game/scenes/credits_scene.hpp

@@ -1,10 +1,10 @@
 #pragma once
 
 #include "core/jail/jdraw8.hpp"
-#include "scenes/frame_animator.hpp"
+#include "game/scenes/frame_animator.hpp"
-#include "scenes/palette_fade.hpp"
+#include "game/scenes/palette_fade.hpp"
-#include "scenes/scene.hpp"
+#include "game/scenes/scene.hpp"
-#include "scenes/surface_handle.hpp"
+#include "game/scenes/surface_handle.hpp"
 
 namespace scenes {
 

source/game/scenes/frame_animator.cpp

@@ -1,4 +1,4 @@
-#include "scenes/frame_animator.hpp"
+#include "game/scenes/frame_animator.hpp"
 
 #include <algorithm>
 

source/game/scenes/intro_new_logo_scene.cpp

@@ -1,11 +1,11 @@
-#include "scenes/intro_new_logo_scene.hpp"
+#include "game/scenes/intro_new_logo_scene.hpp"
 
 #include <cstring>
 
 #include "core/jail/jdraw8.hpp"
 #include "core/jail/jinput.hpp"
 #include "game/info.hpp"
-#include "scenes/scene_utils.hpp"
+#include "game/scenes/scene_utils.hpp"
 
 namespace {
 

source/game/scenes/intro_new_logo_scene.hpp

@@ -3,9 +3,9 @@
 #include <memory>
 
 #include "core/jail/jdraw8.hpp"
-#include "scenes/intro_sprites_scene.hpp"
+#include "game/scenes/intro_sprites_scene.hpp"
-#include "scenes/scene.hpp"
+#include "game/scenes/scene.hpp"
-#include "scenes/surface_handle.hpp"
+#include "game/scenes/surface_handle.hpp"
 
 namespace scenes {
 

source/game/scenes/intro_scene.cpp

@@ -1,9 +1,9 @@
-#include "scenes/intro_scene.hpp"
+#include "game/scenes/intro_scene.hpp"
 
 #include "core/jail/jdraw8.hpp"
 #include "core/jail/jinput.hpp"
 #include "game/info.hpp"
-#include "scenes/scene_utils.hpp"
+#include "game/scenes/scene_utils.hpp"
 
 namespace {
 

source/game/scenes/intro_scene.hpp

@@ -3,9 +3,9 @@
 #include <memory>
 
 #include "core/jail/jdraw8.hpp"
-#include "scenes/intro_sprites_scene.hpp"
+#include "game/scenes/intro_sprites_scene.hpp"
-#include "scenes/scene.hpp"
+#include "game/scenes/scene.hpp"
-#include "scenes/surface_handle.hpp"
+#include "game/scenes/surface_handle.hpp"
 
 namespace scenes {
 

source/game/scenes/intro_sprites_scene.cpp

@@ -1,4 +1,4 @@
-#include "scenes/intro_sprites_scene.hpp"
+#include "game/scenes/intro_sprites_scene.hpp"
 
 #include <algorithm>
 #include <cstdlib>

source/game/scenes/intro_sprites_scene.hpp

@@ -1,7 +1,7 @@
 #pragma once
 
-#include "scenes/scene.hpp"
+#include "game/scenes/scene.hpp"
-#include "scenes/surface_handle.hpp"
+#include "game/scenes/surface_handle.hpp"
 
 namespace scenes {
 

source/game/scenes/menu_scene.cpp

@@ -1,4 +1,4 @@
-#include "scenes/menu_scene.hpp"
+#include "game/scenes/menu_scene.hpp"
 
 #include <cstdlib>
 

source/game/scenes/menu_scene.hpp

@@ -1,9 +1,9 @@
 #pragma once
 
-#include "scenes/frame_animator.hpp"
+#include "game/scenes/frame_animator.hpp"
-#include "scenes/palette_fade.hpp"
+#include "game/scenes/palette_fade.hpp"
-#include "scenes/scene.hpp"
+#include "game/scenes/scene.hpp"
-#include "scenes/surface_handle.hpp"
+#include "game/scenes/surface_handle.hpp"
 
 namespace scenes {
 

source/game/scenes/mort_scene.cpp

@@ -1,11 +1,11 @@
-#include "scenes/mort_scene.hpp"
+#include "game/scenes/mort_scene.hpp"
 
 #include <cstdlib>
 
 #include "core/jail/jdraw8.hpp"
 #include "core/jail/jinput.hpp"
 #include "game/info.hpp"
-#include "scenes/scene_utils.hpp"
+#include "game/scenes/scene_utils.hpp"
 
 namespace scenes {
 

source/game/scenes/mort_scene.hpp

@@ -1,8 +1,8 @@
 #pragma once
 
-#include "scenes/palette_fade.hpp"
+#include "game/scenes/palette_fade.hpp"
-#include "scenes/scene.hpp"
+#include "game/scenes/scene.hpp"
-#include "scenes/surface_handle.hpp"
+#include "game/scenes/surface_handle.hpp"
 
 namespace scenes {
 

source/game/scenes/palette_fade.cpp

@@ -1,4 +1,4 @@
-#include "scenes/palette_fade.hpp"
+#include "game/scenes/palette_fade.hpp"
 
 namespace scenes {
 

source/game/scenes/scene_registry.cpp

@@ -1,4 +1,4 @@
-#include "scenes/scene_registry.hpp"
+#include "game/scenes/scene_registry.hpp"
 
 namespace scenes {
 

source/game/scenes/scene_registry.hpp

@@ -4,7 +4,7 @@
 #include <memory>
 #include <unordered_map>
 
-#include "scenes/scene.hpp"
+#include "game/scenes/scene.hpp"
 
 namespace scenes {
 

source/game/scenes/scene_utils.cpp

@@ -1,4 +1,4 @@
-#include "scenes/scene_utils.hpp"
+#include "game/scenes/scene_utils.hpp"
 
 #include <string>
 

source/game/scenes/secreta_scene.cpp

@@ -1,4 +1,4 @@
-#include "scenes/secreta_scene.hpp"
+#include "game/scenes/secreta_scene.hpp"
 
 #include <algorithm>
 #include <cstdlib>
@@ -8,7 +8,7 @@
 #include "core/jail/jdraw8.hpp"
 #include "core/jail/jinput.hpp"
 #include "game/info.hpp"
-#include "scenes/scene_utils.hpp"
+#include "game/scenes/scene_utils.hpp"
 
 namespace {
 

source/game/scenes/secreta_scene.hpp

@@ -1,9 +1,9 @@
 #pragma once
 
 #include "core/jail/jdraw8.hpp"
-#include "scenes/palette_fade.hpp"
+#include "game/scenes/palette_fade.hpp"
-#include "scenes/scene.hpp"
+#include "game/scenes/scene.hpp"
-#include "scenes/surface_handle.hpp"
+#include "game/scenes/surface_handle.hpp"
 
 namespace scenes {
 

source/game/scenes/slides_scene.cpp

@@ -1,4 +1,4 @@
-#include "scenes/slides_scene.hpp"
+#include "game/scenes/slides_scene.hpp"
 
 #include <algorithm>
 #include <cstdlib>
@@ -8,7 +8,7 @@
 #include "core/jail/jdraw8.hpp"
 #include "core/jail/jinput.hpp"
 #include "game/info.hpp"
-#include "scenes/scene_utils.hpp"
+#include "game/scenes/scene_utils.hpp"
 #include "utils/easing.hpp"
 
 namespace {

source/game/scenes/slides_scene.hpp

@@ -1,9 +1,9 @@
 #pragma once
 
 #include "core/jail/jdraw8.hpp"
-#include "scenes/palette_fade.hpp"
+#include "game/scenes/palette_fade.hpp"
-#include "scenes/scene.hpp"
+#include "game/scenes/scene.hpp"
-#include "scenes/surface_handle.hpp"
+#include "game/scenes/surface_handle.hpp"
 
 namespace scenes {
 

source/game/scenes/sprite_mover.cpp

@@ -1,4 +1,4 @@
-#include "scenes/sprite_mover.hpp"
+#include "game/scenes/sprite_mover.hpp"
 
 #include <algorithm>
 

source/game/scenes/surface_handle.cpp

@@ -1,4 +1,4 @@
-#include "scenes/surface_handle.hpp"
+#include "game/scenes/surface_handle.hpp"
 
 namespace scenes {
 

source/game/scenes/timeline.cpp

@@ -1,4 +1,4 @@
-#include "scenes/timeline.hpp"
+#include "game/scenes/timeline.hpp"
 
 #include <algorithm>