From c4302b4ab7004b28688ace6931bcbee8ba4254c6 Mon Sep 17 00:00:00 2001 From: nmlgc Date: Mon, 15 Aug 2022 09:42:57 +0200 Subject: [PATCH] [Maintenance] [th01] #include common.h from the resident structure header Part of P0216, funded by JonathKane. --- th01/core/resstuff.cpp | 1 - th01/end/end.cpp | 1 - th01/end/vars.cpp | 1 - th01/fuuin_01.cpp | 1 - th01/main/bonus.cpp | 1 - th01/main/boss/b05.cpp | 1 - th01/main/boss/b10j.cpp | 1 + th01/main/boss/b10m.cpp | 1 + th01/main/boss/b15j.cpp | 1 + th01/main/boss/b15m.cpp | 1 + th01/main/boss/b20j.cpp | 2 +- th01/main/boss/b20m.cpp | 2 +- th01/main/boss/defeat.cpp | 1 - th01/main/hiscore.cpp | 1 - th01/main/hud/hud.cpp | 1 - th01/main/stage/card.cpp | 1 + th01/main/stage/item.cpp | 1 - th01/main/stage/stageobj.cpp | 2 +- th01/main/stage/timer.cpp | 1 - th01/main/vars.cpp | 1 + th01/main_01.cpp | 1 - th01/main_32.cpp | 1 + th01/main_38.cpp | 1 - th01/op_01.cpp | 1 + th01/resident.hpp | 2 ++ 25 files changed, 13 insertions(+), 16 deletions(-) diff --git a/th01/core/resstuff.cpp b/th01/core/resstuff.cpp index 66fea3ce..2fd0a3a8 100644 --- a/th01/core/resstuff.cpp +++ b/th01/core/resstuff.cpp @@ -7,7 +7,6 @@ #include "platform.h" #include "master.hpp" -#include "th01/common.h" #include "th01/resident.hpp" #include "th01/core/resstuff.hpp" diff --git a/th01/end/end.cpp b/th01/end/end.cpp index c676b027..3592c187 100644 --- a/th01/end/end.cpp +++ b/th01/end/end.cpp @@ -6,7 +6,6 @@ #include "planar.h" #include "master.hpp" #include "shiftjis.hpp" -#include "th01/common.h" #include "th01/rank.h" #include "th01/resident.hpp" #include "th01/v_colors.hpp" diff --git a/th01/end/vars.cpp b/th01/end/vars.cpp index 568e2349..ec28b7dd 100644 --- a/th01/end/vars.cpp +++ b/th01/end/vars.cpp @@ -1,5 +1,4 @@ #include "platform.h" -#include "th01/common.h" #include "th01/resident.hpp" long score = 100000; diff --git a/th01/fuuin_01.cpp b/th01/fuuin_01.cpp index a5c6575a..d2d4e7c6 100644 --- a/th01/fuuin_01.cpp +++ b/th01/fuuin_01.cpp @@ -9,7 +9,6 @@ #include #include "platform.h" #include "master.hpp" -#include "th01/common.h" #include "th01/resident.hpp" #include "th01/core/initexit.hpp" #include "th01/end/end.hpp" diff --git a/th01/main/bonus.cpp b/th01/main/bonus.cpp index ba1071d2..3f69164e 100644 --- a/th01/main/bonus.cpp +++ b/th01/main/bonus.cpp @@ -6,7 +6,6 @@ #include "planar.h" #include "master.hpp" #include "shiftjis.hpp" -#include "th01/common.h" #include "th01/resident.hpp" #include "th01/v_colors.hpp" #include "th01/math/clamp.hpp" diff --git a/th01/main/boss/b05.cpp b/th01/main/boss/b05.cpp index dc2e57b3..f49e0ff3 100644 --- a/th01/main/boss/b05.cpp +++ b/th01/main/boss/b05.cpp @@ -6,7 +6,6 @@ #include "decomp.hpp" #include "pc98.h" #include "master.hpp" -#include "th01/common.h" #include "th01/resident.hpp" #include "th01/v_colors.hpp" #include "th01/math/area.hpp" diff --git a/th01/main/boss/b10j.cpp b/th01/main/boss/b10j.cpp index 6905b019..bc4a5407 100644 --- a/th01/main/boss/b10j.cpp +++ b/th01/main/boss/b10j.cpp @@ -6,6 +6,7 @@ #include "pc98.h" #include "planar.h" #include "master.hpp" +#include "th01/resident.hpp" #include "th01/v_colors.hpp" #include "th01/math/area.hpp" #include "th01/math/dir.hpp" diff --git a/th01/main/boss/b10m.cpp b/th01/main/boss/b10m.cpp index b7e873f9..236951fd 100644 --- a/th01/main/boss/b10m.cpp +++ b/th01/main/boss/b10m.cpp @@ -8,6 +8,7 @@ #include "pc98.h" #include "planar.h" #include "master.hpp" +#include "th01/resident.hpp" #include "th01/v_colors.hpp" #include "th01/math/area.hpp" #include "th01/math/dir.hpp" diff --git a/th01/main/boss/b15j.cpp b/th01/main/boss/b15j.cpp index 070f8543..e8e233f8 100644 --- a/th01/main/boss/b15j.cpp +++ b/th01/main/boss/b15j.cpp @@ -7,6 +7,7 @@ #include "x86real.h" #include "planar.h" #include "master.hpp" +#include "th01/resident.hpp" #include "th01/v_colors.hpp" #include "th01/hardware/egc.h" #include "th01/hardware/frmdelay.h" diff --git a/th01/main/boss/b15m.cpp b/th01/main/boss/b15m.cpp index b6f1e17e..8327532f 100644 --- a/th01/main/boss/b15m.cpp +++ b/th01/main/boss/b15m.cpp @@ -7,6 +7,7 @@ #include "pc98.h" #include "planar.h" #include "master.hpp" +#include "th01/resident.hpp" #include "th01/v_colors.hpp" #include "th01/math/area.hpp" #include "th01/math/dir.hpp" diff --git a/th01/main/boss/b20j.cpp b/th01/main/boss/b20j.cpp index 4bb926aa..598631ca 100644 --- a/th01/main/boss/b20j.cpp +++ b/th01/main/boss/b20j.cpp @@ -6,7 +6,7 @@ #include "pc98.h" #include "planar.h" #include "master.hpp" -#include "th01/common.h" +#include "th01/resident.hpp" #include "th01/v_colors.hpp" #include "th01/math/area.hpp" #include "th01/math/overlap.hpp" diff --git a/th01/main/boss/b20m.cpp b/th01/main/boss/b20m.cpp index 43d636c9..d156bd48 100644 --- a/th01/main/boss/b20m.cpp +++ b/th01/main/boss/b20m.cpp @@ -8,7 +8,7 @@ #include "pc98.h" #include "planar.h" #include "master.hpp" -#include "th01/common.h" +#include "th01/resident.hpp" #include "th01/v_colors.hpp" #include "th01/math/area.hpp" #include "th01/math/dir.hpp" diff --git a/th01/main/boss/defeat.cpp b/th01/main/boss/defeat.cpp index 62412c7e..87ac5547 100644 --- a/th01/main/boss/defeat.cpp +++ b/th01/main/boss/defeat.cpp @@ -3,7 +3,6 @@ #include "pc98.h" #include "planar.h" #include "shiftjis.hpp" -#include "th01/common.h" #include "th01/resident.hpp" #include "th01/v_colors.hpp" #include "th01/math/area.hpp" diff --git a/th01/main/hiscore.cpp b/th01/main/hiscore.cpp index 42e03707..1dba5cec 100644 --- a/th01/main/hiscore.cpp +++ b/th01/main/hiscore.cpp @@ -1,4 +1,3 @@ -#include "th01/common.h" #include "th01/resident.hpp" void scoredat_load_hiscore(void) diff --git a/th01/main/hud/hud.cpp b/th01/main/hud/hud.cpp index 5d1341a5..c6c37dce 100644 --- a/th01/main/hud/hud.cpp +++ b/th01/main/hud/hud.cpp @@ -5,7 +5,6 @@ #include "x86real.h" #include "master.hpp" #include "shiftjis.hpp" -#include "th01/common.h" #include "th01/resident.hpp" #include "th01/v_colors.hpp" #include "th01/math/str_val.hpp" diff --git a/th01/main/stage/card.cpp b/th01/main/stage/card.cpp index 89faabc4..75831f28 100644 --- a/th01/main/stage/card.cpp +++ b/th01/main/stage/card.cpp @@ -4,6 +4,7 @@ #include "planar.h" #include "master.hpp" #include "shiftjis.hpp" +#include "th01/resident.hpp" #include "th01/v_colors.hpp" #include "th01/formats/ptn.hpp" #include "th01/math/digit.hpp" diff --git a/th01/main/stage/item.cpp b/th01/main/stage/item.cpp index 3ca944b9..d2319540 100644 --- a/th01/main/stage/item.cpp +++ b/th01/main/stage/item.cpp @@ -3,7 +3,6 @@ #include "pc98.h" #include "planar.h" #include "shiftjis.hpp" -#include "th01/common.h" #include "th01/resident.hpp" #include "th01/v_colors.hpp" #include "th01/math/clamp.hpp" diff --git a/th01/main/stage/stageobj.cpp b/th01/main/stage/stageobj.cpp index 565bf75e..07bddcef 100644 --- a/th01/main/stage/stageobj.cpp +++ b/th01/main/stage/stageobj.cpp @@ -6,7 +6,7 @@ #include "decomp.hpp" #include "planar.h" #include "master.hpp" -#include "th01/common.h" +#include "th01/resident.hpp" #include "th01/math/subpixel.hpp" #include "th01/hardware/frmdelay.h" #include "th01/hardware/graph.h" diff --git a/th01/main/stage/timer.cpp b/th01/main/stage/timer.cpp index 63b1d172..fd4a6a29 100644 --- a/th01/main/stage/timer.cpp +++ b/th01/main/stage/timer.cpp @@ -6,7 +6,6 @@ #include "planar.h" #include "master.hpp" #include "shiftjis.hpp" -#include "th01/common.h" #include "th01/resident.hpp" #include "th01/v_colors.hpp" #include "th01/math/str_val.hpp" diff --git a/th01/main/vars.cpp b/th01/main/vars.cpp index f2fcc6cc..093097e5 100644 --- a/th01/main/vars.cpp +++ b/th01/main/vars.cpp @@ -1,4 +1,5 @@ #include "platform.h" +#include "th01/resident.hpp" #include "th01/formats/cfg.hpp" #include "th01/main/vars.hpp" #include "th01/main/stage/stages.hpp" diff --git a/th01/main_01.cpp b/th01/main_01.cpp index 986f0a01..05c5821a 100644 --- a/th01/main_01.cpp +++ b/th01/main_01.cpp @@ -17,7 +17,6 @@ #include "master.hpp" #include "pc98kbd.h" #include "shiftjis.hpp" -#include "th01/common.h" #include "th01/resident.hpp" #include "th01/v_colors.hpp" #include "th01/core/initexit.hpp" diff --git a/th01/main_32.cpp b/th01/main_32.cpp index dc00e197..f18dc7fe 100644 --- a/th01/main_32.cpp +++ b/th01/main_32.cpp @@ -9,6 +9,7 @@ #include "pc98.h" #include "planar.h" #include "master.hpp" +#include "th01/resident.hpp" #include "th01/math/overlap.hpp" #include "th01/hardware/graph.h" #include "th01/snd/mdrv2.h" diff --git a/th01/main_38.cpp b/th01/main_38.cpp index 758ddfe1..967ba703 100644 --- a/th01/main_38.cpp +++ b/th01/main_38.cpp @@ -7,7 +7,6 @@ #include "pc98.h" #include "planar.h" #include "master.hpp" -#include "th01/common.h" #include "th01/resident.hpp" #include "th01/v_colors.hpp" #include "th01/snd/mdrv2.h" diff --git a/th01/op_01.cpp b/th01/op_01.cpp index 6cc5865a..cbeb9953 100644 --- a/th01/op_01.cpp +++ b/th01/op_01.cpp @@ -12,6 +12,7 @@ #include "pc98kbd.h" #include "master.hpp" #include "th01/rank.h" +#include "th01/resident.hpp" #include "th01/hardware/egc.h" #include "th01/hardware/frmdelay.h" #include "th01/hardware/graph.h" diff --git a/th01/resident.hpp b/th01/resident.hpp index ff30f617..334b1ba0 100644 --- a/th01/resident.hpp +++ b/th01/resident.hpp @@ -1,3 +1,5 @@ +#include "th01/common.h" + typedef enum { ROUTE_MAKAI, ROUTE_JIGOKU,