Reduce header includes of physfsx.h

2014-07-20 01:09:55 +00:00 · 2014-07-20 01:09:55 +00:00 · bd1c6d8c5d
parent a6dcfa2e30
commit bd1c6d8c5d
43 changed files with 40 additions and 12 deletions
--- a/common/include/editor/editor.h
+++ b/common/include/editor/editor.h
@ -26,6 +26,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 #ifndef _EDITOR_H
 #define _EDITOR_H

+#include <physfs.h>
 #include "dxxsconf.h"
 #include "vecmat.h"
 #include "segment.h"
--- a/common/include/physfs-serial.h
+++ b/common/include/physfs-serial.h
@ -7,6 +7,7 @@
 #pragma once

 #include <stdexcept>
+#include "physfsx.h"
 #include "serial.h"

 class PHYSFSX_short_read : public std::runtime_error
--- a/common/main/multiinternal.h
+++ b/common/main/multiinternal.h
@ -6,6 +6,7 @@
 */
 #pragma once

+#include "dxxerror.h"
 #include "object.h"
 #include "powerup.h"

--- a/common/main/newdemo.h
+++ b/common/main/newdemo.h
@ -28,6 +28,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 #define _NEWDEMO_H

 #ifdef __cplusplus
+#include "physfsx.h"

 struct object;
 struct objptridx_t;
--- a/common/main/object.h
+++ b/common/main/object.h
@ -35,6 +35,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 #include "laser.h"

 #ifdef __cplusplus
+#include <cassert>
 #include <cstdint>
 #include "dxxsconf.h"
 #include "compiler-array.h"
--- a/common/main/piggy.h
+++ b/common/main/piggy.h
@ -26,7 +26,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 #ifndef _PIGGY_H
 #define _PIGGY_H

-#include "physfsx.h"
+#include <physfs.h>
 #include "sounds.h"
 #include "hash.h"
 #include "inferno.h"
--- a/common/main/segment.h
+++ b/common/main/segment.h
@ -26,17 +26,20 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 #ifndef _SEGMENT_H
 #define _SEGMENT_H

-#include "physfsx.h"
+#include <physfs.h>
 #include "pstypes.h"
 #include "maths.h"
 #include "vecmat.h"
 #include "dxxsconf.h"

 #ifdef __cplusplus
+#include <cassert>
 #include <cstdint>
 #include <stdexcept>
 #include "countarray.h"

+#include "compiler-type_traits.h"
+
 // Version 1 - Initial version
 // Version 2 - Mike changed some shorts to bytes in segments, so incompatible!

--- a/common/main/switch.h
+++ b/common/main/switch.h
@ -26,6 +26,8 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 #ifndef _SWITCH_H
 #define _SWITCH_H

+#include <physfs.h>
+
 #ifdef __cplusplus
 #include "pack.h"

--- a/common/main/vclip.h
+++ b/common/main/vclip.h
@ -29,7 +29,6 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.

 #include "gr.h"
 #include "piggy.h"
-#include "physfsx.h"

 #ifdef __cplusplus
 #include "dxxsconf.h"
--- a/common/main/wall.h
+++ b/common/main/wall.h
@ -26,6 +26,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 #ifndef _WALL_H
 #define _WALL_H

+#include <physfs.h>
 #include "segment.h"

 struct object;
--- a/common/ui/file.cpp
+++ b/common/ui/file.cpp
@ -19,9 +19,9 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.

 #include <stdlib.h>
 #include <string.h>
+#include <physfs.h>

 #include "event.h"
-#include "physfsx.h"
 #include "maths.h"
 #include "pstypes.h"
 #include "gr.h"
--- a/d1x-rebirth/editor/ehostage.cpp
+++ b/d1x-rebirth/editor/ehostage.cpp
@ -29,6 +29,7 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 #include <string.h>
 #include <math.h>

+#include "dxxerror.h"
 #include "screens.h"
 #include "editor/esegment.h"
 #include "ehostage.h"
--- a/d1x-rebirth/main/bmread.cpp
+++ b/d1x-rebirth/main/bmread.cpp
@ -57,6 +57,7 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 #include "cntrlcen.h"
 #include "args.h"
 #include "text.h"
+#include "physfsx.h"
 #include "strutil.h"
 #ifdef EDITOR
 #include "editor/texpage.h"
--- a/d1x-rebirth/main/custom.cpp
+++ b/d1x-rebirth/main/custom.cpp
@ -19,6 +19,7 @@
 #include "hash.h"
 #include "u_mem.h"
 #include "custom.h"
+#include "physfsx.h"

 //#define D2TMAP_CONV // used for testing

--- a/d2x-rebirth/main/bmread.cpp
+++ b/d2x-rebirth/main/bmread.cpp
@ -38,6 +38,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 #include "u_mem.h"
 #include "dxxerror.h"
 #include "object.h"
+#include "physfsx.h"
 #include "vclip.h"
 #include "effects.h"
 #include "polyobj.h"
--- a/d2x-rebirth/main/movie.cpp
+++ b/d2x-rebirth/main/movie.cpp
@ -38,6 +38,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 #include "window.h"
 #include "console.h"
 #include "config.h"
+#include "physfsx.h"
 #include "key.h"
 #include "mouse.h"
 #include "digi.h"
--- a/d2x-rebirth/main/segment.cpp
+++ b/d2x-rebirth/main/segment.cpp
@ -13,6 +13,7 @@


 #include "segment.h"
+#include "physfsx.h"

 /*
 * reads a segment2 structure from a PHYSFS_file
--- a/similar/2d/font.cpp
+++ b/similar/2d/font.cpp
@ -38,6 +38,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 #include "byteutil.h"
 #include "common/2d/bitmap.h"
 #include "makesig.h"
+#include "physfsx.h"
 #include "gamefont.h"
 #include "console.h"
 #include "config.h"
--- a/similar/arch/sdl/jukebox.cpp
+++ b/similar/arch/sdl/jukebox.cpp
@ -13,7 +13,6 @@
 #include <stdio.h>
 #include <string.h>

-#include "physfsx.h"
 #include "hudmsg.h"
 #include "songs.h"
 #include "jukebox.h"
--- a/similar/arch/sdl/mouse.cpp
+++ b/similar/arch/sdl/mouse.cpp
@ -19,6 +19,7 @@
 #include "window.h"
 #include "mouse.h"
 #include "playsave.h"
+#include "dxxerror.h"
 #include "args.h"

 static struct mouseinfo {
--- a/similar/editor/group.cpp
+++ b/similar/editor/group.cpp
@ -35,6 +35,7 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 #include "editor/medmisc.h"
 #include "dxxerror.h"
 #include "gamemine.h"
+#include "physfsx.h"
 #include "gameseg.h"
 #include "bm.h"				// For MAX_TEXTURES.
 #include "textures.h"
--- a/similar/editor/kmine.cpp
+++ b/similar/editor/kmine.cpp
@ -38,6 +38,7 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 #include "kdefs.h"
 #include "info.h"
 #include "game.h"
+#include "physfsx.h"
 #include "gameseq.h"
 #include "object.h"

--- a/similar/editor/med.cpp
+++ b/similar/editor/med.cpp
@ -38,6 +38,7 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 #include "segment.h"
 #include "gr.h"
 #include "palette.h"
+#include "physfsx.h"
 #include "event.h"
 #include "window.h"
 #include "game.h"
@ -57,7 +58,6 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 #include "medlisp.h"
 #endif
 #include "u_mem.h"
-#include "physfsx.h"
 #include "render.h"
 #include "game.h"
 #include "gamefont.h"
--- a/similar/editor/mine.cpp
+++ b/similar/editor/mine.cpp
@ -27,7 +27,6 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 #include <stdlib.h>
 #include <math.h>
 #include <string.h>
-#include "physfsx.h"
 #include "key.h"
 #include "gr.h"
 #include "bm.h"			// for MAX_TEXTURES
@ -38,6 +37,7 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 #include "dxxerror.h"
 #include "textures.h"
 #include "object.h"
+#include "physfsx.h"
 #include "gamemine.h"
 #include "gamesave.h"
 #include "gameseg.h"
--- a/similar/main/ai.cpp
+++ b/similar/main/ai.cpp
@ -40,6 +40,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 #include "escort.h"
 #include "laser.h"
 #include "fvi.h"
+#include "physfsx.h"
 #include "polyobj.h"
 #include "bm.h"
 #include "weapon.h"
--- a/similar/main/automap.cpp
+++ b/similar/main/automap.cpp
@ -58,6 +58,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 #include "wall.h"
 #include "hostage.h"
 #include "fuelcen.h"
+#include "physfsx.h"
 #include "gameseq.h"
 #include "gamefont.h"
 #include "gameseg.h"
--- a/similar/main/credits.cpp
+++ b/similar/main/credits.cpp
@ -49,6 +49,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 #include "songs.h"
 #include "menu.h"
 #include "config.h"
+#include "physfsx.h"
 #if defined(DXX_BUILD_DESCENT_II)
 #include "mission.h"
 #include "gamepal.h"
--- a/similar/main/dumpmine.cpp
+++ b/similar/main/dumpmine.cpp
@ -32,6 +32,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.

 #include "pstypes.h"
 #include "console.h"
+#include "physfsx.h"
 #include "key.h"
 #include "gr.h"
 #include "palette.h"
--- a/similar/main/endlevel.cpp
+++ b/similar/main/endlevel.cpp
@ -58,6 +58,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 #include "wall.h"
 #include "terrain.h"
 #include "polyobj.h"
+#include "physfsx.h"
 #include "bm.h"
 #include "gameseg.h"
 #include "gameseq.h"
--- a/similar/main/gamefont.cpp
+++ b/similar/main/gamefont.cpp
@ -31,6 +31,7 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 #include <string.h>
 #include "strutil.h"
 #include "args.h"
+#include "physfsx.h"
 #include "gamefont.h"
 #include "mission.h"
 #include "config.h"
--- a/similar/main/gamemine.cpp
+++ b/similar/main/gamemine.cpp
@ -38,6 +38,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 #include "gamemine.h"
 #include "dxxerror.h"
 #include "gameseg.h"
+#include "physfsx.h"
 #include "switch.h"
 #include "game.h"
 #include "newmenu.h"
--- a/similar/main/kconfig.cpp
+++ b/similar/main/kconfig.cpp
@ -38,6 +38,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 #include "window.h"
 #include "console.h"
 #include "palette.h"
+#include "physfsx.h"
 #include "game.h"
 #include "gamefont.h"
 #include "iff.h"
--- a/similar/main/kmatrix.cpp
+++ b/similar/main/kmatrix.cpp
@ -38,6 +38,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 #include "game.h"
 #include "gameseq.h"
 #include "window.h"
+#include "physfsx.h"
 #include "gamefont.h"
 #include "u_mem.h"
 #include "newmenu.h"
--- a/similar/main/newdemo.cpp
+++ b/similar/main/newdemo.cpp
@ -83,7 +83,6 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 #include "mission.h"
 #include "piggy.h"
 #include "byteutil.h"
-#include "physfsx.h"
 #include "console.h"
 #include "controls.h"
 #include "playsave.h"
--- a/similar/main/piggy.cpp
+++ b/similar/main/piggy.cpp
@ -43,6 +43,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 #include "palette.h"
 #include "gamefont.h"
 #include "gamepal.h"
+#include "physfsx.h"
 #include "rle.h"
 #include "screens.h"
 #include "piggy.h"
--- a/similar/main/player.cpp
+++ b/similar/main/player.cpp
@ -13,6 +13,7 @@

 #include "player.h"
 #include "byteutil.h"
+#include "physfsx.h"


 void player_rw_swap(player_rw *p, int swap)
--- a/similar/main/playsave.cpp
+++ b/similar/main/playsave.cpp
@ -51,7 +51,6 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 #include "makesig.h"
 #include "byteutil.h"
 #include "u_mem.h"
-#include "physfsx.h"
 #include "args.h"
 #include "vers_id.h"
 #include "newdemo.h"
--- a/similar/main/polyobj.cpp
+++ b/similar/main/polyobj.cpp
@ -36,6 +36,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 #include "u_mem.h"
 #include "args.h"
 #include "byteutil.h"
+#include "physfsx.h"
 #ifndef DRIVE
 #include "texmap.h"
 #include "bm.h"
--- a/similar/main/robot.cpp
+++ b/similar/main/robot.cpp
@ -29,6 +29,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 #include "robot.h"
 #include "object.h"
 #include "polyobj.h"
+#include "physfsx.h"

 int	N_robot_types = 0;
 int	N_robot_joints = 0;
--- a/similar/main/state.cpp
+++ b/similar/main/state.cpp
@ -73,7 +73,6 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 #ifdef OGL
 #include "ogl_init.h"
 #endif
-#include "physfsx.h"

 #include "compiler-range_for.h"
 #include "partial_range.h"
--- a/similar/main/titles.cpp
+++ b/similar/main/titles.cpp
@ -38,6 +38,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 #include "palette.h"
 #include "iff.h"
 #include "pcx.h"
+#include "physfsx.h"
 #include "u_mem.h"
 #include "joy.h"
 #include "titles.h"
--- a/similar/mem/mem.cpp
+++ b/similar/mem/mem.cpp
@ -27,7 +27,6 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include "physfsx.h"
 #include "pstypes.h"
 #include "dxxerror.h"
 #include "args.h"
--- a/similar/misc/physfsx.cpp
+++ b/similar/misc/physfsx.cpp
@ -20,7 +20,6 @@
 #include <HIServices/Processes.h>
 #endif

-#include "physfsx.h"
 #include "args.h"
 #include "newdemo.h"
 #include "console.h"