From cafdd6ee3ef236a7054ffc928f6f842f66ce5682 Mon Sep 17 00:00:00 2001 From: nmlgc Date: Wed, 29 Nov 2023 20:58:38 +0100 Subject: [PATCH] [Maintenance] [th05] #include `common.h` directly inside `resident.hpp` The asymmetry of having to do this for TH05's resident structure but not for TH04's has finally become annoying enough. Part of P0263, funded by [Anonymous]. --- th04/formats/cfg.cpp | 1 - th04/main/demo.cpp | 1 - th04/main/hud/overlay.cpp | 1 - th05/formats/cfg_lres.cpp | 1 - th05/formats/dialog.cpp | 1 - th05/hiscore/view.cpp | 1 - th05/m_char.cpp | 1 - th05/op/start.cpp | 1 - th05/res_kso.cpp | 1 - th05/resident.hpp | 2 ++ 10 files changed, 2 insertions(+), 9 deletions(-) diff --git a/th04/formats/cfg.cpp b/th04/formats/cfg.cpp index b069fa42..6d564838 100644 --- a/th04/formats/cfg.cpp +++ b/th04/formats/cfg.cpp @@ -9,7 +9,6 @@ #include "master.hpp" #include "th04/score.h" #if (GAME == 5) - #include "th04/common.h" #include "th05/resident.hpp" #else #include "th04/resident.hpp" diff --git a/th04/main/demo.cpp b/th04/main/demo.cpp index 837a56e2..bf84432e 100644 --- a/th04/main/demo.cpp +++ b/th04/main/demo.cpp @@ -7,7 +7,6 @@ #include "th04/main/frames.h" #include "th04/main/demo.hpp" #if (GAME == 5) - #include "th04/common.h" #include "th05/mem.h" #include "th05/resident.hpp" #else diff --git a/th04/main/hud/overlay.cpp b/th04/main/hud/overlay.cpp index 92749e2d..fd0f9c48 100644 --- a/th04/main/hud/overlay.cpp +++ b/th04/main/hud/overlay.cpp @@ -6,7 +6,6 @@ #include "pc98.h" #include "master.hpp" #include "shiftjis.hpp" -#include "th04/common.h" #include "th04/score.h" #include "th01/math/subpixel.hpp" #include "th02/v_colors.hpp" diff --git a/th05/formats/cfg_lres.cpp b/th05/formats/cfg_lres.cpp index 2a608d70..29d8bfd2 100644 --- a/th05/formats/cfg_lres.cpp +++ b/th05/formats/cfg_lres.cpp @@ -3,7 +3,6 @@ #include "platform.h" #include "x86real.h" #include "master.hpp" -#include "th04/common.h" #include "th04/score.h" #include "th05/resident.hpp" extern "C" { diff --git a/th05/formats/dialog.cpp b/th05/formats/dialog.cpp index c7610342..44941222 100644 --- a/th05/formats/dialog.cpp +++ b/th05/formats/dialog.cpp @@ -4,7 +4,6 @@ #include "platform.h" #include "pc98.h" #include "master.hpp" -#include "th04/common.h" #include "th04/score.h" #include "th04/main/stage/stage.hpp" #include "th05/playchar.h" diff --git a/th05/hiscore/view.cpp b/th05/hiscore/view.cpp index fcddb21c..d13e194c 100644 --- a/th05/hiscore/view.cpp +++ b/th05/hiscore/view.cpp @@ -2,7 +2,6 @@ extern "C" { #include "platform.h" #include "master.hpp" #include "th01/rank.h" -#include "th04/common.h" #include "th04/formats/scoredat.h" #include "th05/playchar.h" #include "th05/resident.hpp" diff --git a/th05/m_char.cpp b/th05/m_char.cpp index 8b3b530a..895da410 100644 --- a/th05/m_char.cpp +++ b/th05/m_char.cpp @@ -15,7 +15,6 @@ extern "C" { #include "th04/formats/cdg.h" #include "th04/hardware/bgimage.hpp" #include "th04/score.h" -#include "th04/common.h" #include "th05/playchar.h" #include "th04/snd/snd.h" #include "th04/sprites/op_cdg.h" diff --git a/th05/op/start.cpp b/th05/op/start.cpp index 17560c5c..3f281c10 100644 --- a/th05/op/start.cpp +++ b/th05/op/start.cpp @@ -5,7 +5,6 @@ #include "libs/kaja/kaja.h" #include "th01/rank.h" #include "th02/core/initexit.h" -#include "th04/common.h" #include "th04/score.h" #include "th04/end/end.h" #include "th05/playchar.h" diff --git a/th05/res_kso.cpp b/th05/res_kso.cpp index 37f4edfa..fdc4741a 100644 --- a/th05/res_kso.cpp +++ b/th05/res_kso.cpp @@ -10,7 +10,6 @@ #include "master.hpp" #include "th01/rank.h" #include "th04/score.h" -#include "th04/common.h" #include "th05/resident.hpp" #include "th04/snd/snd.h" #include "th04/formats/cfg.hpp" diff --git a/th05/resident.hpp b/th05/resident.hpp index 20c5e1fc..d03495bc 100644 --- a/th05/resident.hpp +++ b/th05/resident.hpp @@ -1,3 +1,5 @@ +#include "th04/common.h" + #define RES_ID "KSOConfig" typedef struct { char id[sizeof(RES_ID)];