shithub: cstory

Info  •  Files  •  Log  •  Branches

Some #include fixes

Finally figured out how to get include-what-you-use working

--- a/DoConfig/DoConfig.cpp

+++ b/DoConfig/DoConfig.cpp

@@ -5,14 +5,17 @@

  * http://sam.zoy.org/wtfpl/COPYING for more details. */

 #include <cstdlib>

-#include <iostream>

 #include <fstream>

-#include <cstring>

 #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 <FL/Fl_Button.H>

+#include <FL/Fl_Group.H>

+#include <FL/Fl_Menu_Item.H>

+#include <FL/Fl_Round_Button.H>

+#include <FL/Enumerations.H>

 #define MAGIC "DOUKUTSU20041206"

 #define FONT "Courier New"

--- a/src/Back.cpp

+++ b/src/Back.cpp

@@ -1,9 +1,11 @@

 #include "Back.h"

+#include <stddef.h>

 #include <stdio.h>

 #include "WindowsWrapper.h"

+#include "CommonDefines.h"

 #include "Draw.h"

 #include "File.h"

 #include "Frame.h"

--- 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)

--- 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)

--- a/src/BulHit.cpp

+++ b/src/BulHit.cpp

@@ -1,13 +1,9 @@

 #include "BulHit.h"

-#include <stdio.h>

-#include <string.h>

-

 #include "Bullet.h"

 #include "Caret.h"

 #include "Game.h"

 #include "Map.h"

-#include "MyChar.h"

 #include "NpChar.h"

 #include "Sound.h"

--- 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

--- 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

 {

--- a/src/Ending.h

+++ b/src/Ending.h

@@ -2,6 +2,8 @@

 #include "WindowsWrapper.h"

+#include "CommonDefines.h"

+

 struct CREDIT

 {

 	int size;

--- 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)

--- a/src/Font.cpp

+++ b/src/Font.cpp

@@ -2,7 +2,6 @@

 #include <math.h>

 #include <stddef.h>

-#include <stdio.h>

 #include <stdlib.h>

 #include <string.h>

--- a/src/Frame.cpp

+++ b/src/Frame.cpp

@@ -1,7 +1,5 @@

 #include "Frame.h"

-#include <string.h>

-

 #include "Boss.h"

 #include "CommonDefines.h"

 #include "Game.h"

--- a/src/Game.cpp

+++ b/src/Game.cpp

@@ -1,8 +1,7 @@

 #include "Game.h"

-#include <stdlib.h>

+#include <stddef.h>

 #include <stdio.h>

-#include <string.h>

 #include <SDL_timer.h>

@@ -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"

--- 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.

--- 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;

--- a/src/Map.cpp

+++ b/src/Map.cpp

@@ -1,6 +1,7 @@

 #include "Map.h"

 #include <stddef.h>

+#include <stdio.h>

 #include <stdlib.h>

 #include <string.h>

--- 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"

--- a/src/MycParam.cpp

+++ b/src/MycParam.cpp

@@ -1,5 +1,7 @@

 #include "MycParam.h"

+#include <stdio.h>

+

 #include "SDL.h"

 #include "WindowsWrapper.h"

--- 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"

--- 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"

--- 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"

--- 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)

--- 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"

--- 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"

--- 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"

--- 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"

--- 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"

--- 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"

--- 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"

--- 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"

--- 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"

--- a/src/NpcAct320.cpp

+++ b/src/NpcAct320.cpp

@@ -1,8 +1,9 @@

 #include "NpcAct.h"

+#include <stddef.h>

+

 #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)

--- 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"

--- a/src/NpcTbl.cpp

+++ b/src/NpcTbl.cpp

@@ -3,7 +3,6 @@

 #include <stddef.h>

 #include <stdio.h>

 #include <stdlib.h>

-#include <string.h>

 #include "WindowsWrapper.h"

--- 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

--- a/src/Organya.cpp

+++ b/src/Organya.cpp

@@ -4,16 +4,12 @@

 #include <stdio.h>

 #include <string.h>

-#include <SDL_thread.h>

-#include <SDL_timer.h>

-#include <SDL_events.h>

+#include "SDL.h"

 #include "WindowsWrapper.h"

-#include "CommonDefines.h"

 #include "Resource.h"

 #include "Sound.h"

-#include "Tags.h"

 #define PANDUMMY 0xFF

 #define VOLDUMMY 0xFF

--- a/src/PixTone.cpp

+++ b/src/PixTone.cpp

@@ -1,7 +1,6 @@

 #include "PixTone.h"

 #include <math.h>

-#include <stdlib.h>

 #include <string.h>

 #include "WindowsWrapper.h"

--- 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"

--- 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"

--- a/src/Sound.cpp

+++ b/src/Sound.cpp

@@ -1,12 +1,11 @@

 #include "Sound.h"

-#include <algorithm>

-#include <cmath>

+#include <math.h>

 #include <stdio.h>

-#include <string>

-#include <cstring>

+#include <stdlib.h>

+#include <string.h>

-#include <SDL.h>

+#include "SDL.h"

 #include "WindowsWrapper.h"

--- 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"

--- 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