From c80b593a3f32b5fcb81b227cfe9f46de7a80a4f6 Mon Sep 17 00:00:00 2001 From: Clownacy Date: Thu, 6 Jun 2019 18:44:28 +0000 Subject: [PATCH] Some #include fixes Finally figured out how to get include-what-you-use working --- DoConfig/DoConfig.cpp | 7 +++++-- src/Back.cpp | 2 ++ src/BossIronH.cpp | 1 + src/BossPress.cpp | 1 + src/BulHit.cpp | 4 ---- src/Config.cpp | 1 - src/Draw.cpp | 1 - src/Ending.h | 2 ++ src/Fade.cpp | 1 - src/Font.cpp | 1 - src/Frame.cpp | 2 -- src/Game.cpp | 5 ++--- src/Input.cpp | 4 ---- src/Main.cpp | 1 - src/Map.cpp | 1 + src/MiniMap.cpp | 1 - src/MycParam.cpp | 2 ++ src/NpcAct020.cpp | 1 - src/NpcAct040.cpp | 1 - src/NpcAct060.cpp | 2 +- src/NpcAct100.cpp | 2 -- src/NpcAct120.cpp | 1 - src/NpcAct140.cpp | 1 - src/NpcAct160.cpp | 1 - src/NpcAct200.cpp | 1 - src/NpcAct220.cpp | 3 --- src/NpcAct240.cpp | 1 - src/NpcAct260.cpp | 1 - src/NpcAct280.cpp | 1 - src/NpcAct300.cpp | 1 - src/NpcAct320.cpp | 4 ++-- src/NpcAct340.cpp | 2 +- src/NpcTbl.cpp | 1 - src/NpcTbl.h | 1 - src/Organya.cpp | 6 +----- src/PixTone.cpp | 1 - src/SelStage.cpp | 1 + src/Shoot.cpp | 2 ++ src/Sound.cpp | 9 ++++----- src/Stage.cpp | 1 - src/ValueView.cpp | 1 - 41 files changed, 28 insertions(+), 55 deletions(-) diff --git a/DoConfig/DoConfig.cpp b/DoConfig/DoConfig.cpp index 185ca7b6..d8cae819 100644 --- a/DoConfig/DoConfig.cpp +++ b/DoConfig/DoConfig.cpp @@ -5,14 +5,17 @@ * http://sam.zoy.org/wtfpl/COPYING for more details. */ #include -#include #include -#include #include "FL/Fl.H" #include "FL/Fl_Window.H" #include "FL/Fl_Radio_Round_Button.H" #include "FL/Fl_Choice.H" #include "FL/Fl_Check_Button.H" +#include +#include +#include +#include +#include #define MAGIC "DOUKUTSU20041206" #define FONT "Courier New" diff --git a/src/Back.cpp b/src/Back.cpp index 7bdcc960..71832cf4 100644 --- a/src/Back.cpp +++ b/src/Back.cpp @@ -1,9 +1,11 @@ #include "Back.h" +#include #include #include "WindowsWrapper.h" +#include "CommonDefines.h" #include "Draw.h" #include "File.h" #include "Frame.h" diff --git a/src/BossIronH.cpp b/src/BossIronH.cpp index c76ec3c0..6ad2f238 100644 --- a/src/BossIronH.cpp +++ b/src/BossIronH.cpp @@ -6,6 +6,7 @@ #include "Frame.h" #include "Game.h" #include "MyChar.h" +#include "NpChar.h" #include "Sound.h" void ActBossChar_Ironhead(void) diff --git a/src/BossPress.cpp b/src/BossPress.cpp index 5412b46e..f9b62b6c 100644 --- a/src/BossPress.cpp +++ b/src/BossPress.cpp @@ -5,6 +5,7 @@ #include "Boss.h" #include "Game.h" #include "Map.h" +#include "NpChar.h" #include "Sound.h" void ActBossChar_Press(void) diff --git a/src/BulHit.cpp b/src/BulHit.cpp index df8330a2..91db2033 100644 --- a/src/BulHit.cpp +++ b/src/BulHit.cpp @@ -1,13 +1,9 @@ #include "BulHit.h" -#include -#include - #include "Bullet.h" #include "Caret.h" #include "Game.h" #include "Map.h" -#include "MyChar.h" #include "NpChar.h" #include "Sound.h" diff --git a/src/Config.cpp b/src/Config.cpp index 909948e3..732466be 100644 --- a/src/Config.cpp +++ b/src/Config.cpp @@ -8,7 +8,6 @@ #include "Config.h" #include "File.h" #include "Tags.h" -#include "Types.h" static const char* const config_filename = "Config.dat"; // Not the original name static const char* const config_magic = "DOUKUTSU20041206"; // Not the original name diff --git a/src/Draw.cpp b/src/Draw.cpp index 58ec6af3..b5834958 100644 --- a/src/Draw.cpp +++ b/src/Draw.cpp @@ -26,7 +26,6 @@ #include "Font.h" #include "Resource.h" #include "Tags.h" -#include "Types.h" struct SURFACE { diff --git a/src/Ending.h b/src/Ending.h index 4a745ce4..04dea864 100644 --- a/src/Ending.h +++ b/src/Ending.h @@ -2,6 +2,8 @@ #include "WindowsWrapper.h" +#include "CommonDefines.h" + struct CREDIT { int size; diff --git a/src/Fade.cpp b/src/Fade.cpp index 403a4e0e..9c5986bc 100644 --- a/src/Fade.cpp +++ b/src/Fade.cpp @@ -6,7 +6,6 @@ #include "WindowsWrapper.h" #include "Draw.h" -#include "Game.h" #define FADE_WIDTH (((WINDOW_WIDTH - 1) / 16) + 1) #define FADE_HEIGHT (((WINDOW_HEIGHT - 1) / 16) + 1) diff --git a/src/Font.cpp b/src/Font.cpp index b4f3da70..4ce46010 100644 --- a/src/Font.cpp +++ b/src/Font.cpp @@ -2,7 +2,6 @@ #include #include -#include #include #include diff --git a/src/Frame.cpp b/src/Frame.cpp index eb1d71af..be669d89 100644 --- a/src/Frame.cpp +++ b/src/Frame.cpp @@ -1,7 +1,5 @@ #include "Frame.h" -#include - #include "Boss.h" #include "CommonDefines.h" #include "Game.h" diff --git a/src/Game.cpp b/src/Game.cpp index cca03ae1..0c38875d 100644 --- a/src/Game.cpp +++ b/src/Game.cpp @@ -1,8 +1,7 @@ #include "Game.h" -#include +#include #include -#include #include @@ -15,6 +14,7 @@ #include "BulHit.h" #include "Bullet.h" #include "Caret.h" +#include "CommonDefines.h" #include "Draw.h" #include "Ending.h" #include "Escape.h" @@ -35,7 +35,6 @@ #include "NpChar.h" #include "NpcHit.h" #include "NpcTbl.h" -#include "Organya.h" #include "Profile.h" #include "SelStage.h" #include "Shoot.h" diff --git a/src/Input.cpp b/src/Input.cpp index af9fb9af..5c663171 100644 --- a/src/Input.cpp +++ b/src/Input.cpp @@ -7,10 +7,6 @@ #include "WindowsWrapper.h" -#include "CommonDefines.h" -#include "Tags.h" -#include "Types.h" - #define JOYSTICK_DEADZONE 10000 SDL_Joystick *joystick; // This was probably a name that was given by Simon, but it fits the rest of Pixel's names so it's fine. diff --git a/src/Main.cpp b/src/Main.cpp index ba1f6f58..6ad3e25c 100644 --- a/src/Main.cpp +++ b/src/Main.cpp @@ -21,7 +21,6 @@ #include "Resource.h" #include "Sound.h" #include "Triangle.h" -#include "Types.h" // These two are defined in Draw.cpp. This is a bit of a hack. extern SDL_Window *gWindow; diff --git a/src/Map.cpp b/src/Map.cpp index 94bec202..25decba2 100644 --- a/src/Map.cpp +++ b/src/Map.cpp @@ -1,6 +1,7 @@ #include "Map.h" #include +#include #include #include diff --git a/src/MiniMap.cpp b/src/MiniMap.cpp index f444580b..ce3f4ea1 100644 --- a/src/MiniMap.cpp +++ b/src/MiniMap.cpp @@ -7,7 +7,6 @@ #include "CommonDefines.h" #include "Draw.h" #include "Escape.h" -#include "Game.h" #include "KeyControl.h" #include "Main.h" #include "Map.h" diff --git a/src/MycParam.cpp b/src/MycParam.cpp index 62527be8..ede5fcdb 100644 --- a/src/MycParam.cpp +++ b/src/MycParam.cpp @@ -1,5 +1,7 @@ #include "MycParam.h" +#include + #include "SDL.h" #include "WindowsWrapper.h" diff --git a/src/NpcAct020.cpp b/src/NpcAct020.cpp index 84156504..f7bc6f6d 100644 --- a/src/NpcAct020.cpp +++ b/src/NpcAct020.cpp @@ -2,7 +2,6 @@ #include "WindowsWrapper.h" -#include "Back.h" #include "Caret.h" #include "Game.h" #include "Frame.h" diff --git a/src/NpcAct040.cpp b/src/NpcAct040.cpp index b9002563..dad7b9ef 100644 --- a/src/NpcAct040.cpp +++ b/src/NpcAct040.cpp @@ -2,7 +2,6 @@ #include "WindowsWrapper.h" -#include "Back.h" #include "Caret.h" #include "CommonDefines.h" #include "Game.h" diff --git a/src/NpcAct060.cpp b/src/NpcAct060.cpp index b57049c3..8c4589a4 100644 --- a/src/NpcAct060.cpp +++ b/src/NpcAct060.cpp @@ -2,8 +2,8 @@ #include "WindowsWrapper.h" -#include "Back.h" #include "CommonDefines.h" +#include "Draw.h" #include "Flash.h" #include "Frame.h" #include "Game.h" diff --git a/src/NpcAct100.cpp b/src/NpcAct100.cpp index ce481c4c..12203beb 100644 --- a/src/NpcAct100.cpp +++ b/src/NpcAct100.cpp @@ -2,7 +2,6 @@ #include "WindowsWrapper.h" -#include "Back.h" #include "Bullet.h" #include "Caret.h" #include "Frame.h" @@ -10,7 +9,6 @@ #include "MyChar.h" #include "NpChar.h" #include "Sound.h" -#include "Triangle.h" // Grate void ActNpc100(NPCHAR *npc) diff --git a/src/NpcAct120.cpp b/src/NpcAct120.cpp index 2e0ba946..8a419708 100644 --- a/src/NpcAct120.cpp +++ b/src/NpcAct120.cpp @@ -2,7 +2,6 @@ #include "WindowsWrapper.h" -#include "Back.h" #include "Bullet.h" #include "Caret.h" #include "Frame.h" diff --git a/src/NpcAct140.cpp b/src/NpcAct140.cpp index a2c78e43..afb1cf92 100644 --- a/src/NpcAct140.cpp +++ b/src/NpcAct140.cpp @@ -2,7 +2,6 @@ #include "WindowsWrapper.h" -#include "Back.h" #include "Bullet.h" #include "Caret.h" #include "CommonDefines.h" diff --git a/src/NpcAct160.cpp b/src/NpcAct160.cpp index f723aec4..83cb51a3 100644 --- a/src/NpcAct160.cpp +++ b/src/NpcAct160.cpp @@ -2,7 +2,6 @@ #include "WindowsWrapper.h" -#include "Back.h" #include "Caret.h" #include "CommonDefines.h" #include "Frame.h" diff --git a/src/NpcAct200.cpp b/src/NpcAct200.cpp index 80db74aa..a458b70e 100644 --- a/src/NpcAct200.cpp +++ b/src/NpcAct200.cpp @@ -2,7 +2,6 @@ #include "WindowsWrapper.h" -#include "Back.h" #include "Bullet.h" #include "Caret.h" #include "Frame.h" diff --git a/src/NpcAct220.cpp b/src/NpcAct220.cpp index b177be2d..f099dc43 100644 --- a/src/NpcAct220.cpp +++ b/src/NpcAct220.cpp @@ -2,10 +2,7 @@ #include "WindowsWrapper.h" -#include "Back.h" -#include "Bullet.h" #include "Caret.h" -#include "Frame.h" #include "Game.h" #include "MyChar.h" #include "NpChar.h" diff --git a/src/NpcAct240.cpp b/src/NpcAct240.cpp index e9f94375..98567704 100644 --- a/src/NpcAct240.cpp +++ b/src/NpcAct240.cpp @@ -2,7 +2,6 @@ #include "WindowsWrapper.h" -#include "Back.h" #include "Caret.h" #include "Frame.h" #include "Game.h" diff --git a/src/NpcAct260.cpp b/src/NpcAct260.cpp index f27f0188..eeaa4000 100644 --- a/src/NpcAct260.cpp +++ b/src/NpcAct260.cpp @@ -2,7 +2,6 @@ #include "WindowsWrapper.h" -#include "Back.h" #include "Caret.h" #include "Frame.h" #include "Game.h" diff --git a/src/NpcAct280.cpp b/src/NpcAct280.cpp index 791061b5..296dd084 100644 --- a/src/NpcAct280.cpp +++ b/src/NpcAct280.cpp @@ -2,7 +2,6 @@ #include "WindowsWrapper.h" -#include "Back.h" #include "Boss.h" #include "Frame.h" #include "Game.h" diff --git a/src/NpcAct300.cpp b/src/NpcAct300.cpp index 0427951d..095e2a86 100644 --- a/src/NpcAct300.cpp +++ b/src/NpcAct300.cpp @@ -4,7 +4,6 @@ #include "WindowsWrapper.h" -#include "Back.h" #include "Boss.h" #include "Bullet.h" #include "Caret.h" diff --git a/src/NpcAct320.cpp b/src/NpcAct320.cpp index 17b4d610..f2b3877d 100644 --- a/src/NpcAct320.cpp +++ b/src/NpcAct320.cpp @@ -1,8 +1,9 @@ #include "NpcAct.h" +#include + #include "WindowsWrapper.h" -#include "Back.h" #include "Bullet.h" #include "Caret.h" #include "Frame.h" @@ -12,7 +13,6 @@ #include "MyChar.h" #include "NpChar.h" #include "Sound.h" -#include "Triangle.h" // Curly (carried, shooting) void ActNpc320(NPCHAR *npc) diff --git a/src/NpcAct340.cpp b/src/NpcAct340.cpp index 6b1ad3f2..d40b3e4c 100644 --- a/src/NpcAct340.cpp +++ b/src/NpcAct340.cpp @@ -2,9 +2,9 @@ #include "WindowsWrapper.h" -#include "Back.h" #include "Caret.h" #include "CommonDefines.h" +#include "Draw.h" #include "Flash.h" #include "Flags.h" #include "Frame.h" diff --git a/src/NpcTbl.cpp b/src/NpcTbl.cpp index 9f9409a3..a6c64440 100644 --- a/src/NpcTbl.cpp +++ b/src/NpcTbl.cpp @@ -3,7 +3,6 @@ #include #include #include -#include #include "WindowsWrapper.h" diff --git a/src/NpcTbl.h b/src/NpcTbl.h index 121cc711..b61455a9 100644 --- a/src/NpcTbl.h +++ b/src/NpcTbl.h @@ -2,7 +2,6 @@ #include "WindowsWrapper.h" -#include "Draw.h" #include "NpChar.h" struct NPC_TBL_RECT diff --git a/src/Organya.cpp b/src/Organya.cpp index 55568d07..6b885b04 100644 --- a/src/Organya.cpp +++ b/src/Organya.cpp @@ -4,16 +4,12 @@ #include #include -#include -#include -#include +#include "SDL.h" #include "WindowsWrapper.h" -#include "CommonDefines.h" #include "Resource.h" #include "Sound.h" -#include "Tags.h" #define PANDUMMY 0xFF #define VOLDUMMY 0xFF diff --git a/src/PixTone.cpp b/src/PixTone.cpp index 02b3da2a..760a3c13 100644 --- a/src/PixTone.cpp +++ b/src/PixTone.cpp @@ -1,7 +1,6 @@ #include "PixTone.h" #include -#include #include #include "WindowsWrapper.h" diff --git a/src/SelStage.cpp b/src/SelStage.cpp index 1664e6eb..aa4d3a02 100644 --- a/src/SelStage.cpp +++ b/src/SelStage.cpp @@ -4,6 +4,7 @@ #include "WindowsWrapper.h" +#include "CommonDefines.h" #include "Draw.h" #include "Escape.h" #include "KeyControl.h" diff --git a/src/Shoot.cpp b/src/Shoot.cpp index 8955e670..c2babebf 100644 --- a/src/Shoot.cpp +++ b/src/Shoot.cpp @@ -1,5 +1,7 @@ #include "Shoot.h" +#include "WindowsWrapper.h" + #include "ArmsItem.h" #include "Bullet.h" #include "Caret.h" diff --git a/src/Sound.cpp b/src/Sound.cpp index d4f22320..2be03cb0 100644 --- a/src/Sound.cpp +++ b/src/Sound.cpp @@ -1,12 +1,11 @@ #include "Sound.h" -#include -#include +#include #include -#include -#include +#include +#include -#include +#include "SDL.h" #include "WindowsWrapper.h" diff --git a/src/Stage.cpp b/src/Stage.cpp index c8424bb6..744026ff 100644 --- a/src/Stage.cpp +++ b/src/Stage.cpp @@ -18,7 +18,6 @@ #include "MyChar.h" #include "NpChar.h" #include "Organya.h" -#include "Tags.h" #include "TextScr.h" #include "ValueView.h" diff --git a/src/ValueView.cpp b/src/ValueView.cpp index 41ea45e9..bb629f6c 100644 --- a/src/ValueView.cpp +++ b/src/ValueView.cpp @@ -3,7 +3,6 @@ #include "WindowsWrapper.h" #include "Draw.h" -#include "Game.h" #include "ValueView.h" #define VALUEVIEW_MAX 0x10