From 358e91ea303cbe806af44c48c731b4c2bbd21c34 Mon Sep 17 00:00:00 2001 From: Sergio Valor Date: Thu, 14 May 2026 18:00:18 +0200 Subject: [PATCH] moure source/scenes a source/game/scenes --- .clang-tidy | 2 +- CMakeLists.txt | 34 +++++++++---------- source/core/system/director.cpp | 22 ++++++------ source/core/system/director.hpp | 2 +- source/game/modulegame.hpp | 4 +-- source/{ => game}/scenes/banner_scene.cpp | 4 +-- source/{ => game}/scenes/banner_scene.hpp | 6 ++-- .../{ => game}/scenes/boot_loader_scene.cpp | 2 +- .../{ => game}/scenes/boot_loader_scene.hpp | 2 +- source/{ => game}/scenes/credits_scene.cpp | 4 +-- source/{ => game}/scenes/credits_scene.hpp | 8 ++--- source/{ => game}/scenes/frame_animator.cpp | 2 +- source/{ => game}/scenes/frame_animator.hpp | 0 .../scenes/intro_new_logo_scene.cpp | 4 +-- .../scenes/intro_new_logo_scene.hpp | 6 ++-- source/{ => game}/scenes/intro_scene.cpp | 4 +-- source/{ => game}/scenes/intro_scene.hpp | 6 ++-- .../{ => game}/scenes/intro_sprites_scene.cpp | 2 +- .../{ => game}/scenes/intro_sprites_scene.hpp | 4 +-- source/{ => game}/scenes/menu_scene.cpp | 2 +- source/{ => game}/scenes/menu_scene.hpp | 8 ++--- source/{ => game}/scenes/mort_scene.cpp | 4 +-- source/{ => game}/scenes/mort_scene.hpp | 6 ++-- source/{ => game}/scenes/palette_fade.cpp | 2 +- source/{ => game}/scenes/palette_fade.hpp | 0 source/{ => game}/scenes/scene.hpp | 0 source/{ => game}/scenes/scene_registry.cpp | 2 +- source/{ => game}/scenes/scene_registry.hpp | 2 +- source/{ => game}/scenes/scene_utils.cpp | 2 +- source/{ => game}/scenes/scene_utils.hpp | 0 source/{ => game}/scenes/secreta_scene.cpp | 4 +-- source/{ => game}/scenes/secreta_scene.hpp | 6 ++-- source/{ => game}/scenes/slides_scene.cpp | 4 +-- source/{ => game}/scenes/slides_scene.hpp | 6 ++-- source/{ => game}/scenes/sprite_mover.cpp | 2 +- source/{ => game}/scenes/sprite_mover.hpp | 0 source/{ => game}/scenes/surface_handle.cpp | 2 +- source/{ => game}/scenes/surface_handle.hpp | 0 source/{ => game}/scenes/timeline.cpp | 2 +- source/{ => game}/scenes/timeline.hpp | 0 40 files changed, 86 insertions(+), 86 deletions(-) rename source/{ => game}/scenes/banner_scene.cpp (96%) rename source/{ => game}/scenes/banner_scene.hpp (90%) rename source/{ => game}/scenes/boot_loader_scene.cpp (97%) rename source/{ => game}/scenes/boot_loader_scene.hpp (95%) rename source/{ => game}/scenes/credits_scene.cpp (98%) rename source/{ => game}/scenes/credits_scene.hpp (90%) rename source/{ => game}/scenes/frame_animator.cpp (95%) rename source/{ => game}/scenes/frame_animator.hpp (100%) rename source/{ => game}/scenes/intro_new_logo_scene.cpp (98%) rename source/{ => game}/scenes/intro_new_logo_scene.hpp (95%) rename source/{ => game}/scenes/intro_scene.cpp (99%) rename source/{ => game}/scenes/intro_scene.hpp (94%) rename source/{ => game}/scenes/intro_sprites_scene.cpp (99%) rename source/{ => game}/scenes/intro_sprites_scene.hpp (96%) rename source/{ => game}/scenes/menu_scene.cpp (99%) rename source/{ => game}/scenes/menu_scene.hpp (91%) rename source/{ => game}/scenes/mort_scene.cpp (95%) rename source/{ => game}/scenes/mort_scene.hpp (89%) rename source/{ => game}/scenes/palette_fade.cpp (95%) rename source/{ => game}/scenes/palette_fade.hpp (100%) rename source/{ => game}/scenes/scene.hpp (100%) rename source/{ => game}/scenes/scene_registry.cpp (92%) rename source/{ => game}/scenes/scene_registry.hpp (97%) rename source/{ => game}/scenes/scene_utils.cpp (92%) rename source/{ => game}/scenes/scene_utils.hpp (100%) rename source/{ => game}/scenes/secreta_scene.cpp (98%) rename source/{ => game}/scenes/secreta_scene.hpp (94%) rename source/{ => game}/scenes/slides_scene.cpp (98%) rename source/{ => game}/scenes/slides_scene.hpp (95%) rename source/{ => game}/scenes/sprite_mover.cpp (96%) rename source/{ => game}/scenes/sprite_mover.hpp (100%) rename source/{ => game}/scenes/surface_handle.cpp (96%) rename source/{ => game}/scenes/surface_handle.hpp (100%) rename source/{ => game}/scenes/timeline.cpp (98%) rename source/{ => game}/scenes/timeline.hpp (100%) diff --git a/.clang-tidy b/.clang-tidy index b3405e5..836f008 100644 --- a/.clang-tidy +++ b/.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: diff --git a/CMakeLists.txt b/CMakeLists.txt index c633ffd..711e410 100644 --- a/CMakeLists.txt +++ b/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/scenes/sprite_mover.cpp - source/scenes/frame_animator.cpp - source/scenes/palette_fade.cpp - source/scenes/surface_handle.cpp - source/scenes/scene_registry.cpp - source/scenes/scene_utils.cpp - source/scenes/boot_loader_scene.cpp - source/scenes/mort_scene.cpp - source/scenes/banner_scene.cpp - source/scenes/menu_scene.cpp - source/scenes/intro_new_logo_scene.cpp - source/scenes/intro_scene.cpp - source/scenes/intro_sprites_scene.cpp - source/scenes/slides_scene.cpp - source/scenes/credits_scene.cpp - source/scenes/secreta_scene.cpp + source/game/scenes/timeline.cpp + source/game/scenes/sprite_mover.cpp + source/game/scenes/frame_animator.cpp + source/game/scenes/palette_fade.cpp + source/game/scenes/surface_handle.cpp + source/game/scenes/scene_registry.cpp + source/game/scenes/scene_utils.cpp + source/game/scenes/boot_loader_scene.cpp + source/game/scenes/mort_scene.cpp + source/game/scenes/banner_scene.cpp + source/game/scenes/menu_scene.cpp + source/game/scenes/intro_new_logo_scene.cpp + source/game/scenes/intro_scene.cpp + source/game/scenes/intro_sprites_scene.cpp + source/game/scenes/slides_scene.cpp + source/game/scenes/credits_scene.cpp + source/game/scenes/secreta_scene.cpp # Game source/game/options.cpp diff --git a/source/core/system/director.cpp b/source/core/system/director.cpp index ae1ed44..b72674e 100644 --- a/source/core/system/director.cpp +++ b/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 "scenes/boot_loader_scene.hpp" -#include "scenes/credits_scene.hpp" -#include "scenes/intro_new_logo_scene.hpp" -#include "scenes/intro_scene.hpp" -#include "scenes/menu_scene.hpp" -#include "scenes/mort_scene.hpp" -#include "scenes/scene.hpp" -#include "scenes/scene_registry.hpp" -#include "scenes/secreta_scene.hpp" -#include "scenes/slides_scene.hpp" +#include "game/scenes/banner_scene.hpp" +#include "game/scenes/boot_loader_scene.hpp" +#include "game/scenes/credits_scene.hpp" +#include "game/scenes/intro_new_logo_scene.hpp" +#include "game/scenes/intro_scene.hpp" +#include "game/scenes/menu_scene.hpp" +#include "game/scenes/mort_scene.hpp" +#include "game/scenes/scene.hpp" +#include "game/scenes/scene_registry.hpp" +#include "game/scenes/secreta_scene.hpp" +#include "game/scenes/slides_scene.hpp" // Cheats del joc original — declarats a jinput.cpp extern void JI_moveCheats(Uint8 new_key); diff --git a/source/core/system/director.hpp b/source/core/system/director.hpp index efd3694..aceb615 100644 --- a/source/core/system/director.hpp +++ b/source/core/system/director.hpp @@ -6,7 +6,7 @@ #include #include -#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 diff --git a/source/game/modulegame.hpp b/source/game/modulegame.hpp index 52aba69..e0574b5 100644 --- a/source/game/modulegame.hpp +++ b/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 "scenes/scene.hpp" +#include "game/scenes/palette_fade.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 diff --git a/source/scenes/banner_scene.cpp b/source/game/scenes/banner_scene.cpp similarity index 96% rename from source/scenes/banner_scene.cpp rename to source/game/scenes/banner_scene.cpp index 19bbeab..4f9a51d 100644 --- a/source/scenes/banner_scene.cpp +++ b/source/game/scenes/banner_scene.cpp @@ -1,4 +1,4 @@ -#include "scenes/banner_scene.hpp" +#include "game/scenes/banner_scene.hpp" #include @@ -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 { diff --git a/source/scenes/banner_scene.hpp b/source/game/scenes/banner_scene.hpp similarity index 90% rename from source/scenes/banner_scene.hpp rename to source/game/scenes/banner_scene.hpp index e5bd9b3..6b82912 100644 --- a/source/scenes/banner_scene.hpp +++ b/source/game/scenes/banner_scene.hpp @@ -1,8 +1,8 @@ #pragma once -#include "scenes/palette_fade.hpp" -#include "scenes/scene.hpp" -#include "scenes/surface_handle.hpp" +#include "game/scenes/palette_fade.hpp" +#include "game/scenes/scene.hpp" +#include "game/scenes/surface_handle.hpp" namespace scenes { diff --git a/source/scenes/boot_loader_scene.cpp b/source/game/scenes/boot_loader_scene.cpp similarity index 97% rename from source/scenes/boot_loader_scene.cpp rename to source/game/scenes/boot_loader_scene.cpp index 392f15c..d90c731 100644 --- a/source/scenes/boot_loader_scene.cpp +++ b/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" diff --git a/source/scenes/boot_loader_scene.hpp b/source/game/scenes/boot_loader_scene.hpp similarity index 95% rename from source/scenes/boot_loader_scene.hpp rename to source/game/scenes/boot_loader_scene.hpp index f39e02e..fdb7804 100644 --- a/source/scenes/boot_loader_scene.hpp +++ b/source/game/scenes/boot_loader_scene.hpp @@ -1,6 +1,6 @@ #pragma once -#include "scenes/scene.hpp" +#include "game/scenes/scene.hpp" namespace scenes { diff --git a/source/scenes/credits_scene.cpp b/source/game/scenes/credits_scene.cpp similarity index 98% rename from source/scenes/credits_scene.cpp rename to source/game/scenes/credits_scene.cpp index 10ff212..bfff3c9 100644 --- a/source/scenes/credits_scene.cpp +++ b/source/game/scenes/credits_scene.cpp @@ -1,4 +1,4 @@ -#include "scenes/credits_scene.hpp" +#include "game/scenes/credits_scene.hpp" #include #include @@ -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 { diff --git a/source/scenes/credits_scene.hpp b/source/game/scenes/credits_scene.hpp similarity index 90% rename from source/scenes/credits_scene.hpp rename to source/game/scenes/credits_scene.hpp index 19d528b..150b608 100644 --- a/source/scenes/credits_scene.hpp +++ b/source/game/scenes/credits_scene.hpp @@ -1,10 +1,10 @@ #pragma once #include "core/jail/jdraw8.hpp" -#include "scenes/frame_animator.hpp" -#include "scenes/palette_fade.hpp" -#include "scenes/scene.hpp" -#include "scenes/surface_handle.hpp" +#include "game/scenes/frame_animator.hpp" +#include "game/scenes/palette_fade.hpp" +#include "game/scenes/scene.hpp" +#include "game/scenes/surface_handle.hpp" namespace scenes { diff --git a/source/scenes/frame_animator.cpp b/source/game/scenes/frame_animator.cpp similarity index 95% rename from source/scenes/frame_animator.cpp rename to source/game/scenes/frame_animator.cpp index 1ec7bbf..f7ab61b 100644 --- a/source/scenes/frame_animator.cpp +++ b/source/game/scenes/frame_animator.cpp @@ -1,4 +1,4 @@ -#include "scenes/frame_animator.hpp" +#include "game/scenes/frame_animator.hpp" #include diff --git a/source/scenes/frame_animator.hpp b/source/game/scenes/frame_animator.hpp similarity index 100% rename from source/scenes/frame_animator.hpp rename to source/game/scenes/frame_animator.hpp diff --git a/source/scenes/intro_new_logo_scene.cpp b/source/game/scenes/intro_new_logo_scene.cpp similarity index 98% rename from source/scenes/intro_new_logo_scene.cpp rename to source/game/scenes/intro_new_logo_scene.cpp index 9d30341..302f7d0 100644 --- a/source/scenes/intro_new_logo_scene.cpp +++ b/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 #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 { diff --git a/source/scenes/intro_new_logo_scene.hpp b/source/game/scenes/intro_new_logo_scene.hpp similarity index 95% rename from source/scenes/intro_new_logo_scene.hpp rename to source/game/scenes/intro_new_logo_scene.hpp index 6a3b32c..77aaa5b 100644 --- a/source/scenes/intro_new_logo_scene.hpp +++ b/source/game/scenes/intro_new_logo_scene.hpp @@ -3,9 +3,9 @@ #include #include "core/jail/jdraw8.hpp" -#include "scenes/intro_sprites_scene.hpp" -#include "scenes/scene.hpp" -#include "scenes/surface_handle.hpp" +#include "game/scenes/intro_sprites_scene.hpp" +#include "game/scenes/scene.hpp" +#include "game/scenes/surface_handle.hpp" namespace scenes { diff --git a/source/scenes/intro_scene.cpp b/source/game/scenes/intro_scene.cpp similarity index 99% rename from source/scenes/intro_scene.cpp rename to source/game/scenes/intro_scene.cpp index 2622073..f8f15eb 100644 --- a/source/scenes/intro_scene.cpp +++ b/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 { diff --git a/source/scenes/intro_scene.hpp b/source/game/scenes/intro_scene.hpp similarity index 94% rename from source/scenes/intro_scene.hpp rename to source/game/scenes/intro_scene.hpp index 1486bdc..8fc8890 100644 --- a/source/scenes/intro_scene.hpp +++ b/source/game/scenes/intro_scene.hpp @@ -3,9 +3,9 @@ #include #include "core/jail/jdraw8.hpp" -#include "scenes/intro_sprites_scene.hpp" -#include "scenes/scene.hpp" -#include "scenes/surface_handle.hpp" +#include "game/scenes/intro_sprites_scene.hpp" +#include "game/scenes/scene.hpp" +#include "game/scenes/surface_handle.hpp" namespace scenes { diff --git a/source/scenes/intro_sprites_scene.cpp b/source/game/scenes/intro_sprites_scene.cpp similarity index 99% rename from source/scenes/intro_sprites_scene.cpp rename to source/game/scenes/intro_sprites_scene.cpp index 442d762..8ccc85a 100644 --- a/source/scenes/intro_sprites_scene.cpp +++ b/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 #include diff --git a/source/scenes/intro_sprites_scene.hpp b/source/game/scenes/intro_sprites_scene.hpp similarity index 96% rename from source/scenes/intro_sprites_scene.hpp rename to source/game/scenes/intro_sprites_scene.hpp index 523223f..b8e0f48 100644 --- a/source/scenes/intro_sprites_scene.hpp +++ b/source/game/scenes/intro_sprites_scene.hpp @@ -1,7 +1,7 @@ #pragma once -#include "scenes/scene.hpp" -#include "scenes/surface_handle.hpp" +#include "game/scenes/scene.hpp" +#include "game/scenes/surface_handle.hpp" namespace scenes { diff --git a/source/scenes/menu_scene.cpp b/source/game/scenes/menu_scene.cpp similarity index 99% rename from source/scenes/menu_scene.cpp rename to source/game/scenes/menu_scene.cpp index 38be035..7c4a808 100644 --- a/source/scenes/menu_scene.cpp +++ b/source/game/scenes/menu_scene.cpp @@ -1,4 +1,4 @@ -#include "scenes/menu_scene.hpp" +#include "game/scenes/menu_scene.hpp" #include diff --git a/source/scenes/menu_scene.hpp b/source/game/scenes/menu_scene.hpp similarity index 91% rename from source/scenes/menu_scene.hpp rename to source/game/scenes/menu_scene.hpp index 64dd4b0..e978d54 100644 --- a/source/scenes/menu_scene.hpp +++ b/source/game/scenes/menu_scene.hpp @@ -1,9 +1,9 @@ #pragma once -#include "scenes/frame_animator.hpp" -#include "scenes/palette_fade.hpp" -#include "scenes/scene.hpp" -#include "scenes/surface_handle.hpp" +#include "game/scenes/frame_animator.hpp" +#include "game/scenes/palette_fade.hpp" +#include "game/scenes/scene.hpp" +#include "game/scenes/surface_handle.hpp" namespace scenes { diff --git a/source/scenes/mort_scene.cpp b/source/game/scenes/mort_scene.cpp similarity index 95% rename from source/scenes/mort_scene.cpp rename to source/game/scenes/mort_scene.cpp index b58a140..5a80cce 100644 --- a/source/scenes/mort_scene.cpp +++ b/source/game/scenes/mort_scene.cpp @@ -1,11 +1,11 @@ -#include "scenes/mort_scene.hpp" +#include "game/scenes/mort_scene.hpp" #include #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 { diff --git a/source/scenes/mort_scene.hpp b/source/game/scenes/mort_scene.hpp similarity index 89% rename from source/scenes/mort_scene.hpp rename to source/game/scenes/mort_scene.hpp index 63a389b..788f3b0 100644 --- a/source/scenes/mort_scene.hpp +++ b/source/game/scenes/mort_scene.hpp @@ -1,8 +1,8 @@ #pragma once -#include "scenes/palette_fade.hpp" -#include "scenes/scene.hpp" -#include "scenes/surface_handle.hpp" +#include "game/scenes/palette_fade.hpp" +#include "game/scenes/scene.hpp" +#include "game/scenes/surface_handle.hpp" namespace scenes { diff --git a/source/scenes/palette_fade.cpp b/source/game/scenes/palette_fade.cpp similarity index 95% rename from source/scenes/palette_fade.cpp rename to source/game/scenes/palette_fade.cpp index 4908328..6cf8420 100644 --- a/source/scenes/palette_fade.cpp +++ b/source/game/scenes/palette_fade.cpp @@ -1,4 +1,4 @@ -#include "scenes/palette_fade.hpp" +#include "game/scenes/palette_fade.hpp" namespace scenes { diff --git a/source/scenes/palette_fade.hpp b/source/game/scenes/palette_fade.hpp similarity index 100% rename from source/scenes/palette_fade.hpp rename to source/game/scenes/palette_fade.hpp diff --git a/source/scenes/scene.hpp b/source/game/scenes/scene.hpp similarity index 100% rename from source/scenes/scene.hpp rename to source/game/scenes/scene.hpp diff --git a/source/scenes/scene_registry.cpp b/source/game/scenes/scene_registry.cpp similarity index 92% rename from source/scenes/scene_registry.cpp rename to source/game/scenes/scene_registry.cpp index f7d5012..1c40ca2 100644 --- a/source/scenes/scene_registry.cpp +++ b/source/game/scenes/scene_registry.cpp @@ -1,4 +1,4 @@ -#include "scenes/scene_registry.hpp" +#include "game/scenes/scene_registry.hpp" namespace scenes { diff --git a/source/scenes/scene_registry.hpp b/source/game/scenes/scene_registry.hpp similarity index 97% rename from source/scenes/scene_registry.hpp rename to source/game/scenes/scene_registry.hpp index 5edb67f..bbafe36 100644 --- a/source/scenes/scene_registry.hpp +++ b/source/game/scenes/scene_registry.hpp @@ -4,7 +4,7 @@ #include #include -#include "scenes/scene.hpp" +#include "game/scenes/scene.hpp" namespace scenes { diff --git a/source/scenes/scene_utils.cpp b/source/game/scenes/scene_utils.cpp similarity index 92% rename from source/scenes/scene_utils.cpp rename to source/game/scenes/scene_utils.cpp index 34a95aa..073c171 100644 --- a/source/scenes/scene_utils.cpp +++ b/source/game/scenes/scene_utils.cpp @@ -1,4 +1,4 @@ -#include "scenes/scene_utils.hpp" +#include "game/scenes/scene_utils.hpp" #include diff --git a/source/scenes/scene_utils.hpp b/source/game/scenes/scene_utils.hpp similarity index 100% rename from source/scenes/scene_utils.hpp rename to source/game/scenes/scene_utils.hpp diff --git a/source/scenes/secreta_scene.cpp b/source/game/scenes/secreta_scene.cpp similarity index 98% rename from source/scenes/secreta_scene.cpp rename to source/game/scenes/secreta_scene.cpp index 3345b4d..0b9281f 100644 --- a/source/scenes/secreta_scene.cpp +++ b/source/game/scenes/secreta_scene.cpp @@ -1,4 +1,4 @@ -#include "scenes/secreta_scene.hpp" +#include "game/scenes/secreta_scene.hpp" #include #include @@ -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 { diff --git a/source/scenes/secreta_scene.hpp b/source/game/scenes/secreta_scene.hpp similarity index 94% rename from source/scenes/secreta_scene.hpp rename to source/game/scenes/secreta_scene.hpp index a0c9e6f..eb9bc78 100644 --- a/source/scenes/secreta_scene.hpp +++ b/source/game/scenes/secreta_scene.hpp @@ -1,9 +1,9 @@ #pragma once #include "core/jail/jdraw8.hpp" -#include "scenes/palette_fade.hpp" -#include "scenes/scene.hpp" -#include "scenes/surface_handle.hpp" +#include "game/scenes/palette_fade.hpp" +#include "game/scenes/scene.hpp" +#include "game/scenes/surface_handle.hpp" namespace scenes { diff --git a/source/scenes/slides_scene.cpp b/source/game/scenes/slides_scene.cpp similarity index 98% rename from source/scenes/slides_scene.cpp rename to source/game/scenes/slides_scene.cpp index 6daa3e3..df6bb1a 100644 --- a/source/scenes/slides_scene.cpp +++ b/source/game/scenes/slides_scene.cpp @@ -1,4 +1,4 @@ -#include "scenes/slides_scene.hpp" +#include "game/scenes/slides_scene.hpp" #include #include @@ -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 { diff --git a/source/scenes/slides_scene.hpp b/source/game/scenes/slides_scene.hpp similarity index 95% rename from source/scenes/slides_scene.hpp rename to source/game/scenes/slides_scene.hpp index 8da4881..c34bf40 100644 --- a/source/scenes/slides_scene.hpp +++ b/source/game/scenes/slides_scene.hpp @@ -1,9 +1,9 @@ #pragma once #include "core/jail/jdraw8.hpp" -#include "scenes/palette_fade.hpp" -#include "scenes/scene.hpp" -#include "scenes/surface_handle.hpp" +#include "game/scenes/palette_fade.hpp" +#include "game/scenes/scene.hpp" +#include "game/scenes/surface_handle.hpp" namespace scenes { diff --git a/source/scenes/sprite_mover.cpp b/source/game/scenes/sprite_mover.cpp similarity index 96% rename from source/scenes/sprite_mover.cpp rename to source/game/scenes/sprite_mover.cpp index b700d25..f044c0d 100644 --- a/source/scenes/sprite_mover.cpp +++ b/source/game/scenes/sprite_mover.cpp @@ -1,4 +1,4 @@ -#include "scenes/sprite_mover.hpp" +#include "game/scenes/sprite_mover.hpp" #include diff --git a/source/scenes/sprite_mover.hpp b/source/game/scenes/sprite_mover.hpp similarity index 100% rename from source/scenes/sprite_mover.hpp rename to source/game/scenes/sprite_mover.hpp diff --git a/source/scenes/surface_handle.cpp b/source/game/scenes/surface_handle.cpp similarity index 96% rename from source/scenes/surface_handle.cpp rename to source/game/scenes/surface_handle.cpp index d59d45a..d663594 100644 --- a/source/scenes/surface_handle.cpp +++ b/source/game/scenes/surface_handle.cpp @@ -1,4 +1,4 @@ -#include "scenes/surface_handle.hpp" +#include "game/scenes/surface_handle.hpp" namespace scenes { diff --git a/source/scenes/surface_handle.hpp b/source/game/scenes/surface_handle.hpp similarity index 100% rename from source/scenes/surface_handle.hpp rename to source/game/scenes/surface_handle.hpp diff --git a/source/scenes/timeline.cpp b/source/game/scenes/timeline.cpp similarity index 98% rename from source/scenes/timeline.cpp rename to source/game/scenes/timeline.cpp index d93df3f..1b12814 100644 --- a/source/scenes/timeline.cpp +++ b/source/game/scenes/timeline.cpp @@ -1,4 +1,4 @@ -#include "scenes/timeline.hpp" +#include "game/scenes/timeline.hpp" #include diff --git a/source/scenes/timeline.hpp b/source/game/scenes/timeline.hpp similarity index 100% rename from source/scenes/timeline.hpp rename to source/game/scenes/timeline.hpp