diff --git a/common/2d/bitblt.cpp b/common/2d/bitblt.cpp index bc88ad2ec..ef6d1b486 100644 --- a/common/2d/bitblt.cpp +++ b/common/2d/bitblt.cpp @@ -28,7 +28,6 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include #include "u_mem.h" #include "gr.h" -#include "grdef.h" #include "rle.h" #include "dxxerror.h" #include "byteutil.h" diff --git a/common/2d/bitmap.cpp b/common/2d/bitmap.cpp index 8e72df834..d5d1d21a5 100644 --- a/common/2d/bitmap.cpp +++ b/common/2d/bitmap.cpp @@ -29,7 +29,6 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include #include "u_mem.h" #include "gr.h" -#include "grdef.h" #include "dxxerror.h" #if DXX_USE_OGL #include "ogl_init.h" diff --git a/common/2d/box.cpp b/common/2d/box.cpp index 7b069aadf..21bbae4ea 100644 --- a/common/2d/box.cpp +++ b/common/2d/box.cpp @@ -19,10 +19,7 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include #include "u_mem.h" - - #include "gr.h" -#include "grdef.h" namespace dcx { diff --git a/common/2d/canvas.cpp b/common/2d/canvas.cpp index 36797a770..b32b31902 100644 --- a/common/2d/canvas.cpp +++ b/common/2d/canvas.cpp @@ -22,7 +22,6 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "u_mem.h" #include "gr.h" -#include "grdef.h" #if DXX_USE_OGL #include "ogl_init.h" #endif diff --git a/common/2d/circle.cpp b/common/2d/circle.cpp index f72895ba2..cd7693fa2 100644 --- a/common/2d/circle.cpp +++ b/common/2d/circle.cpp @@ -19,9 +19,7 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "u_mem.h" - #include "gr.h" -#include "grdef.h" namespace dcx { diff --git a/common/2d/disc.cpp b/common/2d/disc.cpp index 0bc46a2d2..2673275d0 100644 --- a/common/2d/disc.cpp +++ b/common/2d/disc.cpp @@ -12,7 +12,6 @@ #include "u_mem.h" #include "gr.h" -#include "grdef.h" namespace dcx { diff --git a/common/2d/gpixel.cpp b/common/2d/gpixel.cpp index 26d13533b..65224e143 100644 --- a/common/2d/gpixel.cpp +++ b/common/2d/gpixel.cpp @@ -19,7 +19,6 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "u_mem.h" #include "gr.h" -#include "grdef.h" #if DXX_USE_OGL #include "ogl_init.h" #endif diff --git a/common/2d/pixel.cpp b/common/2d/pixel.cpp index 39eb278af..ad9860471 100644 --- a/common/2d/pixel.cpp +++ b/common/2d/pixel.cpp @@ -25,7 +25,6 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "u_mem.h" #include "gr.h" -#include "grdef.h" #if DXX_USE_OGL #include "ogl_init.h" #endif diff --git a/common/2d/rect.cpp b/common/2d/rect.cpp index d7a66a7c2..282c1396a 100644 --- a/common/2d/rect.cpp +++ b/common/2d/rect.cpp @@ -23,9 +23,7 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. */ #include "u_mem.h" - #include "gr.h" -#include "grdef.h" #if DXX_USE_OGL #include "ogl_init.h" diff --git a/common/2d/rle.cpp b/common/2d/rle.cpp index 6166f25f8..92d85a001 100644 --- a/common/2d/rle.cpp +++ b/common/2d/rle.cpp @@ -32,7 +32,6 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "pstypes.h" #include "u_mem.h" #include "gr.h" -#include "grdef.h" #include "dxxerror.h" #include "rle.h" #include "byteutil.h" diff --git a/common/3d/draw.cpp b/common/3d/draw.cpp index d99f05553..e73f466fc 100644 --- a/common/3d/draw.cpp +++ b/common/3d/draw.cpp @@ -16,8 +16,8 @@ #include "3d.h" #include "globvars.h" #include "texmap.h" -#include "clipper.h" #if !DXX_USE_OGL +#include "clipper.h" #include "gr.h" #endif diff --git a/common/3d/setup.cpp b/common/3d/setup.cpp index 2a1b36e12..5657fca7b 100644 --- a/common/3d/setup.cpp +++ b/common/3d/setup.cpp @@ -17,7 +17,6 @@ #include "3d.h" #include "globvars.h" -#include "clipper.h" #if DXX_USE_OGL #include "ogl_init.h" diff --git a/common/arch/sdl/event.cpp b/common/arch/sdl/event.cpp index 9fce58823..0dc33af0f 100644 --- a/common/arch/sdl/event.cpp +++ b/common/arch/sdl/event.cpp @@ -19,6 +19,7 @@ #include "mouse.h" #include "window.h" #include "timer.h" +#include "cmd.h" #include "config.h" #include "inferno.h" diff --git a/common/arch/sdl/joy.cpp b/common/arch/sdl/joy.cpp index c04b2721a..194766540 100644 --- a/common/arch/sdl/joy.cpp +++ b/common/arch/sdl/joy.cpp @@ -21,7 +21,6 @@ #include "console.h" #include "event.h" #include "u_mem.h" -#include "playsave.h" #include "kconfig.h" #include "compiler-range_for.h" diff --git a/common/arch/sdl/mouse.cpp b/common/arch/sdl/mouse.cpp index 38685497b..e49eaeb2e 100644 --- a/common/arch/sdl/mouse.cpp +++ b/common/arch/sdl/mouse.cpp @@ -18,7 +18,6 @@ #include "event.h" #include "window.h" #include "mouse.h" -#include "playsave.h" #include "dxxerror.h" #include "args.h" #include "gr.h" diff --git a/common/include/console.h b/common/include/console.h index 6a89ab5f7..edd04071c 100644 --- a/common/include/console.h +++ b/common/include/console.h @@ -14,8 +14,6 @@ #include "pstypes.h" #include "dxxsconf.h" #include "fmtcheck.h" -#include "cli.h" -#include "cmd.h" #include "d_srcloc.h" #ifdef dsx #include "kconfig.h" diff --git a/common/include/dxxerror.h b/common/include/dxxerror.h index 16df8524b..fe603e73f 100644 --- a/common/include/dxxerror.h +++ b/common/include/dxxerror.h @@ -30,7 +30,6 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "dxxsconf.h" #include "dsx-ns.h" #include -#include "fmtcheck.h" #ifdef __cplusplus diff --git a/common/include/gr.h b/common/include/gr.h index 6c849e58f..a4c9fd419 100644 --- a/common/include/gr.h +++ b/common/include/gr.h @@ -32,7 +32,6 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "palette.h" #include "dxxsconf.h" #include "dsx-ns.h" -#include "fmtcheck.h" #include "pack.h" #include diff --git a/common/include/internal.h b/common/include/internal.h index 218543a05..0132b8d69 100644 --- a/common/include/internal.h +++ b/common/include/internal.h @@ -11,6 +11,7 @@ #include "dxxsconf.h" #if DXX_USE_OGL #include "ogl_init.h" // interface to OpenGL module +#include "ogl_extensions.h" #include "gr.h" #ifdef __cplusplus diff --git a/common/include/joy.h b/common/include/joy.h index 07161bc50..744afdbb4 100644 --- a/common/include/joy.h +++ b/common/include/joy.h @@ -14,7 +14,7 @@ #include "dxxsconf.h" #include "dsx-ns.h" -#include "event.h" +#include "fwd-event.h" #if DXX_MAX_JOYSTICKS #include "pstypes.h" diff --git a/common/include/mouse.h b/common/include/mouse.h index 7d6da46e5..c802f3183 100644 --- a/common/include/mouse.h +++ b/common/include/mouse.h @@ -18,7 +18,6 @@ #ifdef __cplusplus #include #include -#include "fwd-window.h" #include "event.h" struct SDL_MouseButtonEvent; diff --git a/common/include/ogl_init.h b/common/include/ogl_init.h index 22e60b195..a19c160b5 100644 --- a/common/include/ogl_init.h +++ b/common/include/ogl_init.h @@ -25,7 +25,6 @@ #include "palette.h" #include "pstypes.h" #include "3d.h" -#include "ogl_extensions.h" #include #ifdef __cplusplus diff --git a/common/include/partial_range.h b/common/include/partial_range.h index 3a84f4511..63245b466 100644 --- a/common/include/partial_range.h +++ b/common/include/partial_range.h @@ -11,7 +11,6 @@ #include #include #include -#include "fwd-partial_range.h" #include #include "dxxsconf.h" diff --git a/common/main/automap.h b/common/main/automap.h index 8e31fe92a..983d340c7 100644 --- a/common/main/automap.h +++ b/common/main/automap.h @@ -49,7 +49,7 @@ void automap_clear_visited(d_level_unique_automap_state &LevelUniqueAutomapState #include "ntstring.h" #include "d_array.h" #include "d_range.h" -#include "fwd-window.h" +#include "fwd-event.h" #include "segment.h" namespace dsx { diff --git a/common/main/cli.cpp b/common/main/cli.cpp index a018f9eb1..f03d60b7c 100644 --- a/common/main/cli.cpp +++ b/common/main/cli.cpp @@ -34,6 +34,7 @@ #include "gamefont.h" #include "console.h" #include "cli.h" +#include "cmd.h" #include "compiler-poison.h" // Cursor shown if we are in insert mode diff --git a/common/main/cmd.cpp b/common/main/cmd.cpp index a147b1071..61db91bb1 100644 --- a/common/main/cmd.cpp +++ b/common/main/cmd.cpp @@ -23,6 +23,7 @@ #include "u_mem.h" #include "strutil.h" #include "inferno.h" +#include "cmd.h" #include "console.h" #include "cvar.h" #include "physfsx.h" diff --git a/common/main/cvar.cpp b/common/main/cvar.cpp index 1c8eaa262..8d78d9813 100644 --- a/common/main/cvar.cpp +++ b/common/main/cvar.cpp @@ -16,6 +16,7 @@ #include #include +#include "cmd.h" #include "console.h" #include "cvar.h" #include "dxxerror.h" diff --git a/common/main/d_array.h b/common/main/d_array.h index af5d1d709..464c9bfab 100644 --- a/common/main/d_array.h +++ b/common/main/d_array.h @@ -8,7 +8,6 @@ #pragma once #include "dxxsconf.h" #include -#include "fwd-d_array.h" namespace dcx { diff --git a/common/main/digi.h b/common/main/digi.h index 65bc01ad0..bc54eb143 100644 --- a/common/main/digi.h +++ b/common/main/digi.h @@ -28,7 +28,7 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include #include #include "pstypes.h" -#include "vecmat.h" +//#include "vecmat.h" #ifdef __cplusplus #include "dxxsconf.h" diff --git a/common/main/game.h b/common/main/game.h index 4e9597d7c..633441453 100644 --- a/common/main/game.h +++ b/common/main/game.h @@ -36,7 +36,6 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "fwd-segment.h" #include "window.h" #include "d_array.h" -#include "gauges.h" #include "kconfig.h" #include "wall.h" @@ -58,6 +57,7 @@ extern fix FrameTime; // time in seconds since last frame extern fix64 GameTime64; // time in game (sum of FrameTime) extern int d_tick_count; // increments according to DESIGNATED_GAME_FRAMETIME extern int d_tick_step; // true once in interval of DESIGNATED_GAME_FRAMETIME +enum class gauge_inset_window_view : unsigned; } #if defined(DXX_BUILD_DESCENT_II) diff --git a/common/main/mission.h b/common/main/mission.h index 5b88767cd..7c2e048b8 100644 --- a/common/main/mission.h +++ b/common/main/mission.h @@ -32,7 +32,6 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "inferno.h" #include "dxxsconf.h" #include "dsx-ns.h" -#include "fwd-window.h" #include "ntstring.h" diff --git a/common/main/multi.h b/common/main/multi.h index f0da38daa..674c0a7a1 100644 --- a/common/main/multi.h +++ b/common/main/multi.h @@ -31,9 +31,8 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "fwd-player.h" #include "player-callsign.h" #include "player-flags.h" -#include "weapon.h" +#include "fwd-weapon.h" #include "mission.h" -#include "newmenu.h" #include "powerup.h" #include "fwd-object.h" #include "fwd-wall.h" diff --git a/common/main/net_udp.h b/common/main/net_udp.h index a719ea24e..8c663deff 100644 --- a/common/main/net_udp.h +++ b/common/main/net_udp.h @@ -12,6 +12,7 @@ #pragma once #include "multi.h" +#include "newmenu.h" #ifdef __cplusplus #include "pack.h" diff --git a/common/main/object.h b/common/main/object.h index 9e6f17ba6..093fbf189 100644 --- a/common/main/object.h +++ b/common/main/object.h @@ -33,7 +33,6 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "vecmat.h" #include "aistruct.h" #include "polyobj.h" -#include "laser.h" #include #include @@ -44,7 +43,8 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include #include #include "fwd-object.h" -#include "weapon.h" +#include "fwd-weapon.h" +#include "fwd-player.h" #include "powerup.h" #include "compiler-poison.h" #include "physics_info.h" diff --git a/common/main/player.h b/common/main/player.h index 55b50fa81..52b12a2c7 100644 --- a/common/main/player.h +++ b/common/main/player.h @@ -29,7 +29,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include #include "vecmat.h" -#include "weapon.h" +#include "fwd-weapon.h" #ifdef __cplusplus #include diff --git a/common/main/playsave.h b/common/main/playsave.h index e4fd70308..15578a78d 100644 --- a/common/main/playsave.h +++ b/common/main/playsave.h @@ -50,7 +50,6 @@ enum class cockpit_3d_view : uint8_t #endif #include "gameplayopt.h" -#include "gauges.h" #include #define N_SAVE_SLOTS 10 diff --git a/common/main/powerup.h b/common/main/powerup.h index 9626b7a69..13fc40077 100644 --- a/common/main/powerup.h +++ b/common/main/powerup.h @@ -26,7 +26,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #pragma once #include "dxxsconf.h" -#include "vclip.h" +#include "fwd-vclip.h" #include "fmtcheck.h" #ifdef __cplusplus diff --git a/common/main/robot.h b/common/main/robot.h index 3b1168b6e..9f0df95cf 100644 --- a/common/main/robot.h +++ b/common/main/robot.h @@ -30,12 +30,12 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #ifdef __cplusplus #include "pack.h" -#include "ai.h" #include "aistruct.h" #include "polyobj.h" #include "weapon_id.h" #include "object.h" #include "fwd-partial_range.h" +#include "digi.h" #define MAX_GUNS 8 //should be multiple of 4 for ubyte array diff --git a/common/main/sounds.h b/common/main/sounds.h index d9f2cbb58..e35cbee6a 100644 --- a/common/main/sounds.h +++ b/common/main/sounds.h @@ -27,7 +27,6 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #ifndef _SOUNDS_H #define _SOUNDS_H -#include "digi.h" #include #ifdef dsx diff --git a/d2x-rebirth/main/escort.cpp b/d2x-rebirth/main/escort.cpp index 9c7168505..7f7963989 100644 --- a/d2x-rebirth/main/escort.cpp +++ b/d2x-rebirth/main/escort.cpp @@ -36,6 +36,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "palette.h" #include "timer.h" #include "u_mem.h" +#include "weapon.h" #include "object.h" #include "dxxerror.h" @@ -64,7 +65,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "automap.h" #include "laser.h" #include "escort.h" - +#include "vclip.h" #include "segiter.h" #include "compiler-range_for.h" #include "d_levelstate.h" diff --git a/similar/2d/font.cpp b/similar/2d/font.cpp index 24e5e9fcb..dd1c6e392 100644 --- a/similar/2d/font.cpp +++ b/similar/2d/font.cpp @@ -36,10 +36,8 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "u_mem.h" #include "gr.h" -#include "grdef.h" #include "dxxerror.h" #include "common/2d/bitmap.h" -#include "makesig.h" #include "physfsx.h" #include "gamefont.h" #include "byteutil.h" diff --git a/similar/2d/palette.cpp b/similar/2d/palette.cpp index 5d384858b..2c11e7c22 100644 --- a/similar/2d/palette.cpp +++ b/similar/2d/palette.cpp @@ -32,7 +32,6 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "pstypes.h" #include "u_mem.h" #include "gr.h" -#include "grdef.h" #include "dxxerror.h" #include "maths.h" #include "palette.h" diff --git a/similar/2d/pcx.cpp b/similar/2d/pcx.cpp index ef641b4c0..58a9c0316 100644 --- a/similar/2d/pcx.cpp +++ b/similar/2d/pcx.cpp @@ -27,7 +27,6 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include #include "gr.h" -#include "grdef.h" #include "u_mem.h" #include "pcx.h" #include "physfsx.h" diff --git a/similar/3d/interp.cpp b/similar/3d/interp.cpp index bd6a2508c..6ad0303fd 100644 --- a/similar/3d/interp.cpp +++ b/similar/3d/interp.cpp @@ -21,7 +21,6 @@ #include "console.h" #include "common/3d/globvars.h" #include "polyobj.h" -#include "gr.h" #include "byteutil.h" #include "u_mem.h" diff --git a/similar/arch/ogl/gr.cpp b/similar/arch/ogl/gr.cpp index 009ee56cd..87c1ce913 100644 --- a/similar/arch/ogl/gr.cpp +++ b/similar/arch/ogl/gr.cpp @@ -36,26 +36,19 @@ #include #include #include -#include "hudmsg.h" #include "game.h" -#include "text.h" #include "gr.h" #include "gamefont.h" -#include "grdef.h" #include "palette.h" #include "u_mem.h" #include "dxxerror.h" #include "inferno.h" -#include "screens.h" #include "strutil.h" #include "args.h" -#include "key.h" #include "physfsx.h" #include "internal.h" -#include "render.h" #include "console.h" #include "config.h" -#include "playsave.h" #include "vers_id.h" #if defined(__APPLE__) && defined(__MACH__) diff --git a/similar/arch/ogl/ogl.cpp b/similar/arch/ogl/ogl.cpp index adba6d102..dece653a2 100644 --- a/similar/arch/ogl/ogl.cpp +++ b/similar/arch/ogl/ogl.cpp @@ -56,13 +56,11 @@ #include "byteutil.h" #include "internal.h" #include "gauges.h" -#include "playsave.h" #include "object.h" #include "args.h" #include "compiler-range_for.h" #include "d_levelstate.h" -#include "d_range.h" #include "d_zip.h" #include "partial_range.h" diff --git a/similar/arch/sdl/digi.cpp b/similar/arch/sdl/digi.cpp index e6ec0e17e..2d024b523 100644 --- a/similar/arch/sdl/digi.cpp +++ b/similar/arch/sdl/digi.cpp @@ -11,13 +11,11 @@ #include "dxxerror.h" #include "vecmat.h" -#include "piggy.h" #include "config.h" #include "digi.h" #include "sounds.h" #include "console.h" #include "rbaudio.h" -#include "jukebox.h" #include "args.h" #include #include diff --git a/similar/arch/sdl/digi_audio.cpp b/similar/arch/sdl/digi_audio.cpp index d25da63a1..9f899ce99 100644 --- a/similar/arch/sdl/digi_audio.cpp +++ b/similar/arch/sdl/digi_audio.cpp @@ -17,6 +17,7 @@ #include #include #include "dxxerror.h" +#include "fmtcheck.h" #include "vecmat.h" #include "digi.h" #include "sounds.h" diff --git a/similar/arch/sdl/jukebox.cpp b/similar/arch/sdl/jukebox.cpp index e88ae3255..96c0a8e40 100644 --- a/similar/arch/sdl/jukebox.cpp +++ b/similar/arch/sdl/jukebox.cpp @@ -22,7 +22,6 @@ #include "strutil.h" #include "u_mem.h" #include "physfs_list.h" -#include "digi.h" #include "partial_range.h" #include diff --git a/similar/editor/centers.cpp b/similar/editor/centers.cpp index 3694654a0..fbbebebd4 100644 --- a/similar/editor/centers.cpp +++ b/similar/editor/centers.cpp @@ -29,24 +29,17 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include #include "fuelcen.h" -#include "screens.h" #include "inferno.h" #include "event.h" #include "segment.h" #include "editor.h" #include "editor/esegment.h" -#include "timer.h" -#include "objpage.h" #include "maths.h" #include "dxxerror.h" -#include "kdefs.h" -#include "object.h" +#include "object.h" #include "robot.h" #include "game.h" #include "powerup.h" -#include "ai.h" -#include "hostage.h" -#include "eobject.h" #include "medwall.h" #include "eswitch.h" #include "ehostage.h" diff --git a/similar/editor/curves.cpp b/similar/editor/curves.cpp index 541adb296..eee3c366b 100644 --- a/similar/editor/curves.cpp +++ b/similar/editor/curves.cpp @@ -29,10 +29,8 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include #include #include -#include "inferno.h" #include "vecmat.h" #include "gr.h" -#include "key.h" #include "editor.h" #include "editor/esegment.h" #include "gameseg.h" diff --git a/similar/editor/eobject.cpp b/similar/editor/eobject.cpp index 6565fefc0..f02f84433 100644 --- a/similar/editor/eobject.cpp +++ b/similar/editor/eobject.cpp @@ -35,29 +35,25 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "editor/esegment.h" #include "editor/eobject.h" -#include "objpage.h" #include "maths.h" #include "dxxerror.h" #include "kdefs.h" -#include "object.h" +#include "object.h" #include "robot.h" #include "game.h" -#include "ai.h" #include "bm.h" #include "3d.h" // For g3_point_to_vec -#include "fvi.h" +#include "fvi.h" +#include "vclip.h" #include "powerup.h" -#include "fuelcen.h" #include "hostage.h" -#include "medrobot.h" #include "player.h" #include "gameseg.h" #include "cntrlcen.h" #include "compiler-range_for.h" #include "d_levelstate.h" -#include "segiter.h" #define OBJ_SCALE (F1_0/2) #define OBJ_DEL_SIZE (F1_0/2) diff --git a/similar/editor/eswitch.cpp b/similar/editor/eswitch.cpp index faa8bf029..7fcde9707 100644 --- a/similar/editor/eswitch.cpp +++ b/similar/editor/eswitch.cpp @@ -36,14 +36,11 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "segment.h" #include "dxxerror.h" #include "event.h" -#include "gameseg.h" #include "wall.h" #include "medwall.h" -#include "screens.h" #include "textures.h" #include "texmerge.h" #include "medrobot.h" -#include "timer.h" #include "key.h" #include "ehostage.h" #include "centers.h" diff --git a/similar/editor/group.cpp b/similar/editor/group.cpp index 40c4aa85c..a126d757d 100644 --- a/similar/editor/group.cpp +++ b/similar/editor/group.cpp @@ -34,13 +34,11 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "editor/esegment.h" #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" #include "hash.h" -#include "fuelcen.h" #include "kdefs.h" #include "fwd-wall.h" #include "medwall.h" diff --git a/similar/editor/info.cpp b/similar/editor/info.cpp index b06e799fc..04a6c151b 100644 --- a/similar/editor/info.cpp +++ b/similar/editor/info.cpp @@ -39,9 +39,6 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "dxxerror.h" #include "textures.h" #include "object.h" -#include "ai.h" -#include "texpage.h" // Textue selection paging stuff -#include "objpage.h" // Object selection paging stuff #include "wall.h" #include "switch.h" #include "info.h" diff --git a/similar/editor/kbuild.cpp b/similar/editor/kbuild.cpp index f344bcb23..6c5f23b60 100644 --- a/similar/editor/kbuild.cpp +++ b/similar/editor/kbuild.cpp @@ -24,10 +24,8 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. */ #include -#include "inferno.h" #include "editor/editor.h" #include "editor/esegment.h" -#include "gameseg.h" #include "gamesave.h" #include "kdefs.h" #include "compiler-range_for.h" diff --git a/similar/editor/kcurve.cpp b/similar/editor/kcurve.cpp index cfbbe69dc..a2bf9d9a2 100644 --- a/similar/editor/kcurve.cpp +++ b/similar/editor/kcurve.cpp @@ -26,7 +26,6 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include -#include "inferno.h" #include "editor.h" #include "editor/esegment.h" #include "kdefs.h" diff --git a/similar/editor/kfuncs.cpp b/similar/editor/kfuncs.cpp index 823bfe027..376a4b443 100644 --- a/similar/editor/kfuncs.cpp +++ b/similar/editor/kfuncs.cpp @@ -27,7 +27,6 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "inferno.h" #include "func.h" #include "editor/kdefs.h" -#include "segment.h" #include "editor/editor.h" #include "dxxerror.h" #include "slew.h" diff --git a/similar/editor/kgame.cpp b/similar/editor/kgame.cpp index 8bf5b159c..03d9188ca 100644 --- a/similar/editor/kgame.cpp +++ b/similar/editor/kgame.cpp @@ -30,7 +30,6 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "inferno.h" #include "editor.h" #include "ui.h" -#include "game.h" #include "gamesave.h" #include "object.h" #include "gameseq.h" diff --git a/similar/editor/khelp.cpp b/similar/editor/khelp.cpp index c59a46e84..c78e39b87 100644 --- a/similar/editor/khelp.cpp +++ b/similar/editor/khelp.cpp @@ -24,7 +24,6 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. */ -#include "inferno.h" #include "editor.h" #include "kdefs.h" diff --git a/similar/editor/ksegmove.cpp b/similar/editor/ksegmove.cpp index 1d6e482b8..26c4436f8 100644 --- a/similar/editor/ksegmove.cpp +++ b/similar/editor/ksegmove.cpp @@ -23,7 +23,6 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. * */ -#include "inferno.h" #include "editor.h" #include "editor/esegment.h" #include "kdefs.h" diff --git a/similar/editor/ksegsel.cpp b/similar/editor/ksegsel.cpp index b4c8b4918..3e2d74196 100644 --- a/similar/editor/ksegsel.cpp +++ b/similar/editor/ksegsel.cpp @@ -26,7 +26,6 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include #include -#include "inferno.h" #include "editor/editor.h" #include "editor/esegment.h" #include "editor/medmisc.h" diff --git a/similar/editor/ksegsize.cpp b/similar/editor/ksegsize.cpp index 503cf466c..b35678d61 100644 --- a/similar/editor/ksegsize.cpp +++ b/similar/editor/ksegsize.cpp @@ -24,7 +24,6 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. */ #include -#include "inferno.h" #include "editor.h" #include "editor/esegment.h" #include "dxxerror.h" diff --git a/similar/editor/ktmap.cpp b/similar/editor/ktmap.cpp index 7b2ae78af..df8045b63 100644 --- a/similar/editor/ktmap.cpp +++ b/similar/editor/ktmap.cpp @@ -24,7 +24,6 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. */ #include -#include "inferno.h" #include "editor.h" #include "editor/esegment.h" #include "kdefs.h" diff --git a/similar/editor/kview.cpp b/similar/editor/kview.cpp index 618b5b52a..020331161 100644 --- a/similar/editor/kview.cpp +++ b/similar/editor/kview.cpp @@ -24,7 +24,6 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. */ -#include "inferno.h" #include "editor.h" #include "editor/esegment.h" #include "editor/medmisc.h" diff --git a/similar/editor/med.cpp b/similar/editor/med.cpp index b37bd1332..41a1c5ac5 100644 --- a/similar/editor/med.cpp +++ b/similar/editor/med.cpp @@ -55,7 +55,6 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "mouse.h" #include "dxxerror.h" #include "kfuncs.h" -#include "macro.h" #ifdef INCLUDE_XLISP #include "medlisp.h" #endif @@ -75,7 +74,6 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "object.h" #include "effects.h" #include "info.h" -#include "ai.h" #include "console.h" #include "texpage.h" // Textue selection paging stuff #include "objpage.h" // Object selection paging stuff @@ -84,11 +82,7 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "medmisc.h" #include "meddraw.h" #include "medsel.h" -#include "medrobot.h" #include "medwall.h" -#include "eswitch.h" -#include "ehostage.h" -#include "centers.h" #include "fuelcen.h" #include "gameseq.h" diff --git a/similar/editor/meddraw.cpp b/similar/editor/meddraw.cpp index ff54f46f7..009c51b22 100644 --- a/similar/editor/meddraw.cpp +++ b/similar/editor/meddraw.cpp @@ -38,20 +38,12 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "editor/esegment.h" #include "wall.h" #include "switch.h" -#include "key.h" -#include "mouse.h" #include "dxxerror.h" -#include "medlisp.h" #include "u_mem.h" #include "render.h" -#include "game.h" -#include "kdefs.h" #include "func.h" #include "textures.h" -#include "screens.h" -#include "texmap.h" #include "object.h" -#include "fuelcen.h" #include "meddraw.h" #include "d_enumerate.h" #include "d_levelstate.h" diff --git a/similar/editor/medmisc.cpp b/similar/editor/medmisc.cpp index fbbf0dca3..de5b79b5d 100644 --- a/similar/editor/medmisc.cpp +++ b/similar/editor/medmisc.cpp @@ -32,21 +32,15 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "3d.h" #include "u_mem.h" #include "dxxerror.h" -#include "key.h" -#include "mouse.h" #include "func.h" #include "inferno.h" #include "editor/editor.h" #include "editor/esegment.h" #include "editor/medmisc.h" -#include "gameseg.h" #include "segment.h" #include "render.h" -#include "screens.h" #include "object.h" -#include "texpage.h" // For texpage_goto_first #include "meddraw.h" // For draw_World -#include "game.h" #include "kdefs.h" #if DXX_USE_OGL diff --git a/similar/editor/medrobot.cpp b/similar/editor/medrobot.cpp index cba14f911..aa67f8d58 100644 --- a/similar/editor/medrobot.cpp +++ b/similar/editor/medrobot.cpp @@ -28,7 +28,6 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include #include -#include "screens.h" #include "inferno.h" #include "segment.h" #include "event.h" @@ -40,12 +39,11 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "maths.h" #include "dxxerror.h" #include "kdefs.h" -#include "object.h" +#include "object.h" #include "robot.h" #include "game.h" #include "powerup.h" #include "ai.h" -#include "hostage.h" #include "eobject.h" #include "medwall.h" #include "medrobot.h" diff --git a/similar/editor/medsel.cpp b/similar/editor/medsel.cpp index a921dcea3..d2f2fd826 100644 --- a/similar/editor/medsel.cpp +++ b/similar/editor/medsel.cpp @@ -29,8 +29,6 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include #include "gr.h" #include "ui.h" -#include "key.h" -#include "dxxerror.h" #include "u_mem.h" #include "inferno.h" #include "gameseg.h" diff --git a/similar/editor/medwall.cpp b/similar/editor/medwall.cpp index 399207cae..b3c899afb 100644 --- a/similar/editor/medwall.cpp +++ b/similar/editor/medwall.cpp @@ -38,15 +38,12 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "game.h" #include "gameseg.h" #include "textures.h" -#include "screens.h" #include "switch.h" #include "editor/eswitch.h" #include "texmerge.h" -#include "medrobot.h" #include "timer.h" #include "cntrlcen.h" #include "key.h" -#include "ehostage.h" #include "centers.h" #include "piggy.h" #include "kdefs.h" diff --git a/similar/editor/mine.cpp b/similar/editor/mine.cpp index 07edd166b..e8803d348 100644 --- a/similar/editor/mine.cpp +++ b/similar/editor/mine.cpp @@ -28,7 +28,6 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include #include #include -#include "key.h" #include "gr.h" #include "bm.h" // for MAX_TEXTURES #include "inferno.h" @@ -38,14 +37,10 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "wall.h" #include "dxxerror.h" #include "textures.h" -#include "object.h" #include "physfsx.h" #include "gamemine.h" #include "gamesave.h" -#include "gameseg.h" #include "ui.h" // Because texpage.h need UI_DIALOG type -#include "texpage.h" // For texpage_goto_first -#include "medwall.h" #include "switch.h" #include "fuelcen.h" diff --git a/similar/editor/objpage.cpp b/similar/editor/objpage.cpp index aa69eb955..341343a70 100644 --- a/similar/editor/objpage.cpp +++ b/similar/editor/objpage.cpp @@ -27,19 +27,18 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include #include #include "inferno.h" -#include "screens.h" // For GAME_SCREEN????? #include "editor.h" // For TMAP_CURBOX?????? #include "gr.h" // For canves, font stuff #include "ui.h" // For UI_GADGET stuff #include "object.h" // For robot_bms #include "event.h" -#include "dxxerror.h" #include "objpage.h" #include "bm.h" #include "player.h" #include "piggy.h" #include "cntrlcen.h" #include "kdefs.h" +#include "vclip.h" constexpr std::integral_constant OBJS_PER_PAGE{}; @@ -51,7 +50,6 @@ static int ObjectPage = 0; #include "vecmat.h" #include "3d.h" #include "robot.h" -#include "texmap.h" #include "hostage.h" #include "powerup.h" diff --git a/similar/editor/segment.cpp b/similar/editor/segment.cpp index 5d9c2e0ed..76c15e0e8 100644 --- a/similar/editor/segment.cpp +++ b/similar/editor/segment.cpp @@ -27,7 +27,6 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include #include #include -#include "key.h" #include "gr.h" #include "inferno.h" #include "segment.h" @@ -37,17 +36,13 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "object.h" #include "gameseg.h" #include "render.h" -#include "game.h" #include "wall.h" #include "switch.h" #include "fuelcen.h" -#include "cntrlcen.h" #include "seguvs.h" -#include "gameseq.h" #include "kdefs.h" #include "medwall.h" -#include "hostage.h" #include "compiler-poison.h" #include "compiler-range_for.h" diff --git a/similar/editor/seguvs.cpp b/similar/editor/seguvs.cpp index 1c129aaf3..c4f9e8fea 100644 --- a/similar/editor/seguvs.cpp +++ b/similar/editor/seguvs.cpp @@ -38,7 +38,6 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "wall.h" #include "editor/kdefs.h" #include "bm.h" // Needed for TmapInfo -#include "effects.h" // Needed for effects_bm_num #include "fvi.h" #include "seguvs.h" diff --git a/similar/editor/texpage.cpp b/similar/editor/texpage.cpp index e5808386a..337172cba 100644 --- a/similar/editor/texpage.cpp +++ b/similar/editor/texpage.cpp @@ -30,7 +30,6 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "inferno.h" #include "gameseg.h" -#include "screens.h" // For GAME_SCREEN????? #include "editor.h" // For TMAP_CURBOX?????? #include "gr.h" // For canves, font stuff #include "ui.h" // For UI_GADGET stuff diff --git a/similar/editor/texture.cpp b/similar/editor/texture.cpp index abbc9ca6e..33455416f 100644 --- a/similar/editor/texture.cpp +++ b/similar/editor/texture.cpp @@ -28,13 +28,11 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include #include #include -#include "inferno.h" #include "segment.h" #include "seguvs.h" #include "editor.h" #include "editor/esegment.h" #include "maths.h" -#include "dxxerror.h" #include "kdefs.h" #include "compiler-range_for.h" diff --git a/similar/main/ai.cpp b/similar/main/ai.cpp index bc360875a..367a557d8 100644 --- a/similar/main/ai.cpp +++ b/similar/main/ai.cpp @@ -34,7 +34,6 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "3d.h" #include "object.h" -#include "render.h" #include "dxxerror.h" #include "ai.h" #include "escort.h" @@ -53,17 +52,13 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "fireball.h" #include "morph.h" #include "effects.h" -#include "timer.h" #include "sounds.h" #include "gameseg.h" #include "cntrlcen.h" #include "multibot.h" #include "multi.h" #include "gameseq.h" -#include "key.h" #include "powerup.h" -#include "gauges.h" -#include "text.h" #include "args.h" #include "fuelcen.h" #include "controls.h" @@ -72,7 +67,6 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #if DXX_USE_EDITOR #include "editor/editor.h" #include "editor/esegment.h" -#include "editor/kdefs.h" #endif //added 05/17/99 Matt Mueller @@ -83,7 +77,6 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "segiter.h" #include "d_enumerate.h" #include "d_levelstate.h" -#include "d_range.h" #include using std::min; diff --git a/similar/main/aipath.cpp b/similar/main/aipath.cpp index 79c1e10e4..0fcebbcce 100644 --- a/similar/main/aipath.cpp +++ b/similar/main/aipath.cpp @@ -44,7 +44,6 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "editor/esegment.h" #endif #include "player.h" -#include "fireball.h" #include "game.h" #include "compiler-range_for.h" diff --git a/similar/main/automap.cpp b/similar/main/automap.cpp index d0a6f4578..d125efe8d 100644 --- a/similar/main/automap.cpp +++ b/similar/main/automap.cpp @@ -39,7 +39,6 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "u_mem.h" #include "render.h" #include "object.h" -#include "vclip.h" #include "game.h" #include "polyobj.h" #include "sounds.h" @@ -47,20 +46,14 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "bm.h" #include "key.h" #include "newmenu.h" -#include "menu.h" -#include "screens.h" #include "textures.h" #include "hudmsg.h" -#include "mouse.h" #include "timer.h" #include "segpoint.h" #include "joy.h" -#include "iff.h" #include "pcx.h" #include "palette.h" #include "wall.h" -#include "hostage.h" -#include "fuelcen.h" #include "physfsx.h" #include "gameseq.h" #include "gamefont.h" @@ -74,11 +67,9 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "powerup.h" #include "switch.h" #include "automap.h" -#include "cntrlcen.h" #include "timer.h" #include "config.h" #include "playsave.h" -#include "rbaudio.h" #include "window.h" #include "playsave.h" #include "args.h" diff --git a/similar/main/bm.cpp b/similar/main/bm.cpp index b3ccc58d5..8ba16bb83 100644 --- a/similar/main/bm.cpp +++ b/similar/main/bm.cpp @@ -58,7 +58,6 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "console.h" #include "rle.h" #include "physfsx.h" -#include "internal.h" #include "strutil.h" #if DXX_USE_EDITOR diff --git a/similar/main/bmread.cpp b/similar/main/bmread.cpp index f9a995864..919f2897d 100644 --- a/similar/main/bmread.cpp +++ b/similar/main/bmread.cpp @@ -48,7 +48,6 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "iff.h" #include "hostage.h" #include "powerup.h" -#include "laser.h" #include "sounds.h" #include "piggy.h" #include "aistruct.h" diff --git a/similar/main/cntrlcen.cpp b/similar/main/cntrlcen.cpp index 09d305e56..a33a3df34 100644 --- a/similar/main/cntrlcen.cpp +++ b/similar/main/cntrlcen.cpp @@ -43,9 +43,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "segment.h" #include "object.h" #include "robot.h" -#include "vclip.h" #include "physfs-serial.h" -#include "fireball.h" #include "endlevel.h" #include "state.h" #include "args.h" diff --git a/similar/main/collide.cpp b/similar/main/collide.cpp index 555a2fa95..6a0c8dd75 100644 --- a/similar/main/collide.cpp +++ b/similar/main/collide.cpp @@ -37,14 +37,11 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "bm.h" #include "3d.h" #include "segment.h" -#include "texmap.h" #include "laser.h" #include "key.h" #include "gameseg.h" #include "object.h" #include "physics.h" -#include "slew.h" -#include "render.h" #include "wall.h" #include "vclip.h" #include "polyobj.h" @@ -54,14 +51,12 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "dxxerror.h" #include "ai.h" #include "hostage.h" -#include "fuelcen.h" #include "sounds.h" #include "robot.h" #include "weapon.h" #include "player.h" #include "gauges.h" #include "powerup.h" -#include "newmenu.h" #include "scores.h" #include "effects.h" #include "textures.h" @@ -77,9 +72,6 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "switch.h" #include "palette.h" #include "gameseq.h" -#if DXX_USE_EDITOR -#include "editor/editor.h" -#endif #include "collide.h" #include "escort.h" diff --git a/similar/main/config.cpp b/similar/main/config.cpp index 6acfa98e6..4b9aba07c 100644 --- a/similar/main/config.cpp +++ b/similar/main/config.cpp @@ -36,8 +36,6 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "songs.h" #include "kconfig.h" #include "palette.h" -#include "args.h" -#include "player.h" #include "digi.h" #include "mission.h" #include "u_mem.h" diff --git a/similar/main/console.cpp b/similar/main/console.cpp index 35ded7c8b..bdc8bf1e7 100644 --- a/similar/main/console.cpp +++ b/similar/main/console.cpp @@ -29,6 +29,7 @@ #include "vers_id.h" #include "timer.h" #include "cli.h" +#include "cmd.h" #include "cvar.h" #include "dxxsconf.h" diff --git a/similar/main/controls.cpp b/similar/main/controls.cpp index 58845f856..9b9c24d32 100644 --- a/similar/main/controls.cpp +++ b/similar/main/controls.cpp @@ -26,9 +26,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include #include -#include "key.h" #include "joy.h" -#include "timer.h" #include "dxxerror.h" #include "inferno.h" #include "game.h" @@ -37,10 +35,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "weapon.h" #include "bm.h" #include "controls.h" -#include "render.h" -#include "args.h" #include "palette.h" -#include "mouse.h" #include "kconfig.h" #if defined(DXX_BUILD_DESCENT_II) #include "laser.h" diff --git a/similar/main/credits.cpp b/similar/main/credits.cpp index 26b71a0d7..a16a435cb 100644 --- a/similar/main/credits.cpp +++ b/similar/main/credits.cpp @@ -37,15 +37,12 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "key.h" #include "mouse.h" #include "palette.h" -#include "game.h" #include "timer.h" #include "gamefont.h" #include "pcx.h" #include "credits.h" #include "u_mem.h" #include "screens.h" -#include "digi.h" -#include "rbaudio.h" #include "text.h" #include "songs.h" #include "menu.h" diff --git a/similar/main/digiobj.cpp b/similar/main/digiobj.cpp index ff3b4175e..41169ab49 100644 --- a/similar/main/digiobj.cpp +++ b/similar/main/digiobj.cpp @@ -34,14 +34,11 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "digi_audio.h" #include "sounds.h" #include "args.h" -#include "key.h" #include "newdemo.h" -#include "game.h" #include "gameseg.h" #include "dxxerror.h" #include "wall.h" #include "piggy.h" -#include "text.h" #include "kconfig.h" #include "config.h" diff --git a/similar/main/dumpmine.cpp b/similar/main/dumpmine.cpp index 78065130f..f3967befb 100644 --- a/similar/main/dumpmine.cpp +++ b/similar/main/dumpmine.cpp @@ -35,31 +35,23 @@ 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" #include "fmtcheck.h" #include "inferno.h" -#if DXX_USE_EDITOR -#include "editor/editor.h" -#endif #include "dxxerror.h" #include "object.h" #include "wall.h" -#include "gamemine.h" #include "gameseg.h" #include "robot.h" -#include "player.h" #include "newmenu.h" #include "textures.h" #include "text.h" #include "bm.h" -#include "menu.h" #include "switch.h" #include "fuelcen.h" #include "powerup.h" -#include "gameseq.h" #include "polyobj.h" #include "gamesave.h" #include "piggy.h" @@ -67,7 +59,6 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "compiler-range_for.h" #include "d_enumerate.h" #include "d_levelstate.h" -#include "d_range.h" #include "d_zip.h" #include "segiter.h" diff --git a/similar/main/effects.cpp b/similar/main/effects.cpp index e6f923aa5..439f04ddb 100644 --- a/similar/main/effects.cpp +++ b/similar/main/effects.cpp @@ -38,7 +38,6 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "u_mem.h" #include "textures.h" #include "physfs-serial.h" -#include "cntrlcen.h" #include "segment.h" #include "dxxerror.h" #include "object.h" diff --git a/similar/main/endlevel.cpp b/similar/main/endlevel.cpp index e585c48db..b879a7481 100644 --- a/similar/main/endlevel.cpp +++ b/similar/main/endlevel.cpp @@ -52,7 +52,6 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "game.h" #include "gamepal.h" #include "screens.h" -#include "gauges.h" #include "terrain.h" #include "robot.h" #include "player.h" @@ -72,13 +71,11 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "movie.h" #endif #include "render.h" -#include "titles.h" #include "hudmsg.h" #if DXX_USE_OGL #include "ogl_init.h" #endif -#include "key.h" #include "joy.h" #if DXX_USE_EDITOR diff --git a/similar/main/fireball.cpp b/similar/main/fireball.cpp index dd934963d..8bdbd1948 100644 --- a/similar/main/fireball.cpp +++ b/similar/main/fireball.cpp @@ -49,18 +49,12 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "weapon.h" #include "fireball.h" #include "collide.h" -#include "newmenu.h" -#include "gameseq.h" #include "physics.h" -#include "scores.h" #include "laser.h" #include "wall.h" #include "multi.h" -#include "endlevel.h" #include "timer.h" -#include "fuelcen.h" #include "playsave.h" -#include "cntrlcen.h" #include "gameseg.h" #include "automap.h" #include "byteutil.h" diff --git a/similar/main/fuelcen.cpp b/similar/main/fuelcen.cpp index 2bd20f445..5fd9fc523 100644 --- a/similar/main/fuelcen.cpp +++ b/similar/main/fuelcen.cpp @@ -32,7 +32,6 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "gameseg.h" #include "game.h" // For FrameTime #include "dxxerror.h" -#include "gauges.h" #include "vclip.h" #include "fireball.h" #include "robot.h" @@ -45,11 +44,9 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "bm.h" #include "polyobj.h" #include "ai.h" -#include "gamemine.h" #include "gamesave.h" #include "player.h" #include "collide.h" -#include "laser.h" #include "multi.h" #include "multibot.h" #include "escort.h" diff --git a/similar/main/game.cpp b/similar/main/game.cpp index f06da0473..eb1db3ee0 100644 --- a/similar/main/game.cpp +++ b/similar/main/game.cpp @@ -47,19 +47,15 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "key.h" #include "config.h" #include "object.h" -#include "physics.h" #include "dxxerror.h" #include "joy.h" -#include "iff.h" #include "pcx.h" #include "timer.h" #include "render.h" #include "laser.h" #include "screens.h" #include "textures.h" -#include "slew.h" #include "gauges.h" -#include "texmap.h" #include "3d.h" #include "effects.h" #include "menu.h" @@ -91,15 +87,12 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "switch.h" #include "controls.h" #include "songs.h" -#include "rbaudio.h" #include "multi.h" #include "cntrlcen.h" #include "pcx.h" #include "state.h" #include "piggy.h" -#include "multibot.h" -#include "fvi.h" #include "ai.h" #include "robot.h" #include "playsave.h" diff --git a/similar/main/gamecntl.cpp b/similar/main/gamecntl.cpp index 738d2bb3b..a4e9d1708 100644 --- a/similar/main/gamecntl.cpp +++ b/similar/main/gamecntl.cpp @@ -38,11 +38,8 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "key.h" #include "object.h" #include "menu.h" -#include "physics.h" #include "dxxerror.h" #include "joy.h" -#include "iff.h" -#include "pcx.h" #include "timer.h" #include "render.h" #include "laser.h" @@ -52,7 +49,6 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "gauges.h" #include "texmap.h" #include "3d.h" -#include "effects.h" #include "gameseg.h" #include "wall.h" #include "ai.h" @@ -78,19 +74,15 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "config.h" #include "hudmsg.h" #include "kconfig.h" -#include "mouse.h" #include "titles.h" #include "gr.h" #include "playsave.h" -#include "scores.h" #include "multi.h" #include "cntrlcen.h" #include "fuelcen.h" -#include "pcx.h" #include "state.h" #include "piggy.h" -#include "multibot.h" #include "ai.h" #include "rbaudio.h" #include "switch.h" diff --git a/similar/main/gamefont.cpp b/similar/main/gamefont.cpp index 1416fae44..1ee878f83 100644 --- a/similar/main/gamefont.cpp +++ b/similar/main/gamefont.cpp @@ -29,7 +29,6 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "gr.h" #include "dxxerror.h" #include -#include "strutil.h" #include "args.h" #include "physfsx.h" #include "gamefont.h" diff --git a/similar/main/gamemine.cpp b/similar/main/gamemine.cpp index b2b6f0aa3..f4b1047e6 100644 --- a/similar/main/gamemine.cpp +++ b/similar/main/gamemine.cpp @@ -41,15 +41,8 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "physfsx.h" #include "switch.h" #include "game.h" -#include "newmenu.h" -#if DXX_USE_EDITOR -#include "editor/editor.h" -#include "editor/esegment.h" -#include "d_range.h" -#endif #include "fuelcen.h" #include "hash.h" -#include "key.h" #include "piggy.h" #include "gamesave.h" #include "compiler-poison.h" diff --git a/similar/main/gamerend.cpp b/similar/main/gamerend.cpp index 95fba0d35..eb7bdaaf3 100644 --- a/similar/main/gamerend.cpp +++ b/similar/main/gamerend.cpp @@ -36,7 +36,6 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "bm.h" #include "player.h" #include "render.h" -#include "menu.h" #include "newmenu.h" #include "screens.h" #include "config.h" @@ -50,9 +49,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "multi.h" #include "hudmsg.h" #include "endlevel.h" -#include "cntrlcen.h" #include "powerup.h" -#include "laser.h" #include "playsave.h" #include "automap.h" #include "mission.h" diff --git a/similar/main/gamesave.cpp b/similar/main/gamesave.cpp index ef82f9dc8..a7d40e4a8 100644 --- a/similar/main/gamesave.cpp +++ b/similar/main/gamesave.cpp @@ -29,7 +29,6 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "pstypes.h" #include "strutil.h" #include "console.h" -#include "key.h" #include "gr.h" #include "palette.h" #include "newmenu.h" @@ -43,23 +42,19 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "object.h" #include "game.h" #include "gameseg.h" -#include "screens.h" #include "wall.h" #include "gamemine.h" #include "robot.h" #include "bm.h" -#include "menu.h" #include "fireball.h" #include "switch.h" #include "fuelcen.h" #include "cntrlcen.h" #include "powerup.h" -#include "hostage.h" #include "weapon.h" #include "player.h" #include "newdemo.h" #include "gameseq.h" -#include "automap.h" #include "polyobj.h" #include "text.h" #include "gamefont.h" @@ -72,7 +67,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "textures.h" #include "d_enumerate.h" #include "d_range.h" - +#include "vclip.h" #include "compiler-range_for.h" #include "d_levelstate.h" #include "d_zip.h" diff --git a/similar/main/gameseg.cpp b/similar/main/gameseg.cpp index 8bca249b4..f0502b51e 100644 --- a/similar/main/gameseg.cpp +++ b/similar/main/gameseg.cpp @@ -36,11 +36,8 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "console.h" #include "vecmat.h" #include "gameseg.h" -#include "gameseq.h" #include "wall.h" -#include "fuelcen.h" #include "textures.h" -#include "fvi.h" #include "object.h" #include "byteutil.h" #include "lighting.h" diff --git a/similar/main/gameseq.cpp b/similar/main/gameseq.cpp index 3281a3ad0..ca2c6823d 100644 --- a/similar/main/gameseq.cpp +++ b/similar/main/gameseq.cpp @@ -43,20 +43,14 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "player.h" #include "key.h" #include "object.h" -#include "physics.h" #include "dxxerror.h" #include "joy.h" -#include "iff.h" -#include "pcx.h" #include "timer.h" -#include "render.h" #include "laser.h" #include "event.h" #include "screens.h" #include "textures.h" -#include "slew.h" #include "gauges.h" -#include "texmap.h" #include "3d.h" #include "effects.h" #include "menu.h" @@ -71,10 +65,8 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "u_mem.h" #include "palette.h" #include "morph.h" -#include "lighting.h" #include "newdemo.h" #include "titles.h" -#include "collide.h" #include "weapon.h" #include "sounds.h" #include "args.h" @@ -88,33 +80,27 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "playsave.h" #include "fireball.h" #include "kconfig.h" -#include "config.h" #include "robot.h" #include "automap.h" #include "cntrlcen.h" #include "powerup.h" #include "text.h" #include "piggy.h" -#include "texmerge.h" -#include "paging.h" #include "mission.h" #include "state.h" #include "songs.h" #include "gamepal.h" #include "controls.h" #include "credits.h" -#include "gamemine.h" #if DXX_USE_EDITOR #include "editor/editor.h" #endif #include "strutil.h" -#include "rle.h" #include "segment.h" #include "gameseg.h" #include "fmtcheck.h" #include "compiler-range_for.h" -#include "d_enumerate.h" #include "d_levelstate.h" #include "partial_range.h" #include "d_range.h" diff --git a/similar/main/gauges.cpp b/similar/main/gauges.cpp index 4daeda037..10ba72bbb 100644 --- a/similar/main/gauges.cpp +++ b/similar/main/gauges.cpp @@ -33,12 +33,9 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "hudmsg.h" #include "inferno.h" #include "game.h" -#include "screens.h" #include "gauges.h" #include "physics.h" #include "dxxerror.h" -#include "menu.h" // For the font. -#include "collide.h" #include "object.h" #include "newdemo.h" #include "player.h" @@ -49,7 +46,6 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "sounds.h" #include "multi.h" #include "endlevel.h" -#include "cntrlcen.h" #include "controls.h" #include "text.h" #include "render.h" @@ -63,7 +59,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "ogl_init.h" #endif #include "args.h" - +#include "vclip.h" #include "compiler-range_for.h" #include "d_levelstate.h" #include "partial_range.h" diff --git a/similar/main/hostage.cpp b/similar/main/hostage.cpp index a692d3a38..e51cb0828 100644 --- a/similar/main/hostage.cpp +++ b/similar/main/hostage.cpp @@ -26,18 +26,16 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include #include #include -#include "dxxerror.h" #include "inferno.h" #include "object.h" #include "hudmsg.h" #include "game.h" #include "player.h" -#include "gauges.h" #include "hostage.h" -#include "vclip.h" #include "newdemo.h" #include "text.h" #include "d_levelstate.h" +#include "digi.h" //------------- Globaly used hostage variables -------------------------------- diff --git a/similar/main/hud.cpp b/similar/main/hud.cpp index 0bff6cac2..a1b1d8701 100644 --- a/similar/main/hud.cpp +++ b/similar/main/hud.cpp @@ -22,19 +22,11 @@ #include "object.h" #include "inferno.h" #include "game.h" -#include "screens.h" #include "gauges.h" -#include "physics.h" -#include "dxxerror.h" -#include "menu.h" // For the font. -#include "collide.h" #include "newdemo.h" #include "player.h" #include "gamefont.h" -#include "screens.h" #include "text.h" -#include "laser.h" -#include "args.h" #include "playsave.h" #include "countarray.h" #include "d_levelstate.h" diff --git a/similar/main/inferno.cpp b/similar/main/inferno.cpp index fc2970ee9..f00a786eb 100644 --- a/similar/main/inferno.cpp +++ b/similar/main/inferno.cpp @@ -58,7 +58,6 @@ char copyright[] = "DESCENT II COPYRIGHT (C) 1994-1996 PARALLAX SOFTWARE CORPOR #include "console.h" #include "gr.h" #include "key.h" -#include "3d.h" #include "bm.h" #include "inferno.h" #include "dxxerror.h" @@ -66,7 +65,6 @@ char copyright[] = "DESCENT II COPYRIGHT (C) 1994-1996 PARALLAX SOFTWARE CORPOR #include "game.h" #include "u_mem.h" #include "screens.h" -#include "texmap.h" #include "texmerge.h" #include "menu.h" #include "digi.h" @@ -74,24 +72,22 @@ char copyright[] = "DESCENT II COPYRIGHT (C) 1994-1996 PARALLAX SOFTWARE CORPOR #include "args.h" #include "titles.h" #include "text.h" -#include "gauges.h" #include "gamefont.h" #include "kconfig.h" #include "newmenu.h" #include "config.h" #include "multi.h" -#include "songs.h" #include "gameseq.h" #if defined(DXX_BUILD_DESCENT_II) #include "gamepal.h" #include "movie.h" #endif #include "playsave.h" -#include "collide.h" #include "newdemo.h" #include "joy.h" #if !DXX_USE_OGL #include "../texmap/scanline.h" //for select_tmap -MM +#include "texmap.h" #endif #include "event.h" #include "rbaudio.h" @@ -101,7 +97,6 @@ char copyright[] = "DESCENT II COPYRIGHT (C) 1994-1996 PARALLAX SOFTWARE CORPOR #if DXX_USE_EDITOR #include "messagebox.h" #include "editor/editor.h" -#include "editor/kdefs.h" #include "ui.h" #endif #include "vers_id.h" diff --git a/similar/main/kconfig.cpp b/similar/main/kconfig.cpp index 3fd3dc164..ddd4e694f 100644 --- a/similar/main/kconfig.cpp +++ b/similar/main/kconfig.cpp @@ -42,36 +42,20 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "physfsx.h" #include "game.h" #include "gamefont.h" -#include "iff.h" #include "u_mem.h" #include "kconfig.h" -#include "gauges.h" -#include "rbaudio.h" -#include "render.h" #include "digi.h" #include "key.h" #include "mouse.h" #include "newmenu.h" -#include "endlevel.h" #include "multi.h" #include "timer.h" #include "text.h" #include "player.h" -#include "menu.h" -#include "automap.h" #include "args.h" -#include "lighting.h" -#include "ai.h" -#include "cntrlcen.h" -#include "collide.h" #include "playsave.h" #include "screens.h" -#if DXX_USE_OGL -#include "ogl_init.h" -#endif - -#include "compiler-range_for.h" #include "d_array.h" #include "d_range.h" #include "d_zip.h" diff --git a/similar/main/kmatrix.cpp b/similar/main/kmatrix.cpp index 99b1d0c66..506577e31 100644 --- a/similar/main/kmatrix.cpp +++ b/similar/main/kmatrix.cpp @@ -45,12 +45,9 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "menu.h" #include "player.h" #include "screens.h" -#include "cntrlcen.h" -#include "mouse.h" #include "joy.h" #include "timer.h" #include "text.h" -#include "rbaudio.h" #include "net_udp.h" #include "kmatrix.h" #include "gauges.h" @@ -61,10 +58,6 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "compiler-range_for.h" #include "d_levelstate.h" -#if DXX_USE_OGL -#include "ogl_init.h" -#endif - #define CENTERING_OFFSET(x) ((300 - (70 + (x)*25 ))/2) #define CENTERSCREEN (SWIDTH/2) #define KMATRIX_VIEW_SEC 7 // Time after reactor explosion until new level - in seconds diff --git a/similar/main/laser.cpp b/similar/main/laser.cpp index 99553192e..b68b3f467 100644 --- a/similar/main/laser.cpp +++ b/similar/main/laser.cpp @@ -32,17 +32,11 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "bm.h" #include "object.h" #include "laser.h" -#include "args.h" #include "segment.h" #include "fvi.h" -#include "segpoint.h" #include "dxxerror.h" -#include "key.h" -#include "texmap.h" #include "gameseg.h" #include "textures.h" -#include "render.h" -#include "vclip.h" #include "fireball.h" #include "polyobj.h" #include "robot.h" diff --git a/similar/main/lighting.cpp b/similar/main/lighting.cpp index aa8e0794f..3824a0ac8 100644 --- a/similar/main/lighting.cpp +++ b/similar/main/lighting.cpp @@ -36,7 +36,6 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "inferno.h" #include "segment.h" #include "dxxerror.h" -#include "render.h" #include "game.h" #include "vclip.h" #include "lighting.h" @@ -55,7 +54,6 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "multi.h" #include "palette.h" #include "bm.h" -#include "rle.h" #include "wall.h" #include "compiler-range_for.h" diff --git a/similar/main/menu.cpp b/similar/main/menu.cpp index 9f3deca00..6cf0e6971 100644 --- a/similar/main/menu.cpp +++ b/similar/main/menu.cpp @@ -33,7 +33,6 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "gr.h" #include "key.h" #include "mouse.h" -#include "iff.h" #include "u_mem.h" #include "dxxerror.h" #include "bm.h" @@ -41,16 +40,11 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "joy.h" #include "player.h" #include "vecmat.h" -#include "effects.h" #include "game.h" -#include "slew.h" -#include "gamemine.h" -#include "gamesave.h" #include "palette.h" #include "args.h" #include "newdemo.h" #include "timer.h" -#include "object.h" #include "sounds.h" #include "gameseq.h" #include "text.h" @@ -59,9 +53,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "scores.h" #include "playsave.h" #include "kconfig.h" -#include "titles.h" #include "credits.h" -#include "texmap.h" #include "polyobj.h" #include "state.h" #include "mission.h" @@ -74,7 +66,6 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "movie.h" #endif #include "gamepal.h" -#include "gauges.h" #include "powerup.h" #include "strutil.h" #include "multi.h" @@ -88,6 +79,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #endif #if DXX_USE_OGL #include "ogl_init.h" +#include "ogl_extensions.h" #endif #include "physfs_list.h" @@ -672,6 +664,7 @@ int dispatch_menu_option(const main_menu_item_index select) case main_menu_item_index::load_existing_singleplayer_game: state_restore_all(0, secret_restore::none, nullptr, blind_save::no); break; +#ifndef RELEASE #if DXX_USE_EDITOR case main_menu_item_index::open_mine_editor_window: if (!Current_mission) @@ -683,6 +676,7 @@ int dispatch_menu_option(const main_menu_item_index select) hide_menus(); init_editor(); break; +#endif #endif case main_menu_item_index::open_high_scores_dialog: scores_view_menu(); diff --git a/similar/main/mglobal.cpp b/similar/main/mglobal.cpp index fdaf43544..7f218639d 100644 --- a/similar/main/mglobal.cpp +++ b/similar/main/mglobal.cpp @@ -36,6 +36,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "player.h" #include "bm.h" #include "robot.h" +#include "ai.h" #include "3d.h" #include "game.h" #include "textures.h" diff --git a/similar/main/mission.cpp b/similar/main/mission.cpp index 7e33901c0..d2da925e5 100644 --- a/similar/main/mission.cpp +++ b/similar/main/mission.cpp @@ -36,12 +36,9 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "inferno.h" #include "window.h" #include "mission.h" -#include "gameseq.h" #include "gamesave.h" -#include "titles.h" #include "piggy.h" #include "console.h" -#include "songs.h" #include "polyobj.h" #include "dxxerror.h" #include "config.h" @@ -51,7 +48,6 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "ignorecase.h" #include "physfsx.h" #include "physfs_list.h" -#include "bm.h" #include "event.h" #if defined(DXX_BUILD_DESCENT_II) #include "movie.h" diff --git a/similar/main/morph.cpp b/similar/main/morph.cpp index e0515dbde..7f4165a88 100644 --- a/similar/main/morph.cpp +++ b/similar/main/morph.cpp @@ -28,7 +28,6 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include #include -#include "texmap.h" #include "dxxerror.h" #include "inferno.h" #include "polyobj.h" diff --git a/similar/main/multi.cpp b/similar/main/multi.cpp index 4fb774417..127f4cbd4 100644 --- a/similar/main/multi.cpp +++ b/similar/main/multi.cpp @@ -41,8 +41,6 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "object.h" #include "player.h" #include "laser.h" -#include "fuelcen.h" -#include "scores.h" #include "gauges.h" #include "gameseg.h" #include "weapon.h" @@ -56,7 +54,6 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "powerup.h" #include "polyobj.h" #include "bm.h" -#include "endlevel.h" #include "key.h" #include "playsave.h" #include "timer.h" @@ -70,8 +67,6 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "multibot.h" #include "gameseq.h" #include "physics.h" -#include "config.h" -#include "ai.h" #include "switch.h" #include "textures.h" #include "sounds.h" diff --git a/similar/main/multibot.cpp b/similar/main/multibot.cpp index 556eeddbd..da032556f 100644 --- a/similar/main/multibot.cpp +++ b/similar/main/multibot.cpp @@ -37,7 +37,6 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "laser.h" #include "dxxerror.h" #include "timer.h" -#include "text.h" #include "player.h" #include "ai.h" #include "fireball.h" @@ -45,7 +44,6 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "gameseg.h" #include "robot.h" #include "powerup.h" -#include "scores.h" #include "gauges.h" #include "fuelcen.h" #include "morph.h" diff --git a/similar/main/net_udp.cpp b/similar/main/net_udp.cpp index 3653d6adb..513145fbd 100644 --- a/similar/main/net_udp.cpp +++ b/similar/main/net_udp.cpp @@ -22,27 +22,20 @@ #include "timer.h" #include "newmenu.h" #include "key.h" -#include "gauges.h" #include "object.h" #include "dxxerror.h" #include "laser.h" -#include "gamesave.h" -#include "gamemine.h" #include "player.h" #include "gameseq.h" -#include "fireball.h" #include "net_udp.h" #include "game.h" #include "multi.h" -#include "endlevel.h" #include "palette.h" -#include "cntrlcen.h" #include "powerup.h" #include "menu.h" #include "gameseg.h" #include "sounds.h" #include "text.h" -#include "kmatrix.h" #include "newdemo.h" #include "multibot.h" #include "state.h" @@ -53,14 +46,12 @@ #include "hudmsg.h" #include "switch.h" #include "textures.h" -#include "automap.h" #include "event.h" #include "playsave.h" #include "gamefont.h" -#include "rbaudio.h" -#include "config.h" #include "vers_id.h" #include "u_mem.h" +#include "weapon.h" #include "compiler-cf_assert.h" #include "compiler-range_for.h" diff --git a/similar/main/newdemo.cpp b/similar/main/newdemo.cpp index 5cc5495dd..baa37222f 100644 --- a/similar/main/newdemo.cpp +++ b/similar/main/newdemo.cpp @@ -41,20 +41,13 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "weapon.h" #include "segment.h" #include "strutil.h" -#include "texmap.h" -#include "laser.h" -#include "key.h" #include "gameseg.h" #include "object.h" -#include "physics.h" -#include "slew.h" #include "render.h" #include "wall.h" #include "vclip.h" #include "robot.h" -#include "fireball.h" -#include "laser.h" #include "dxxerror.h" #include "ai.h" #include "hostage.h" @@ -62,17 +55,15 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "physfs_list.h" #include "powerup.h" -#include "fuelcen.h" #include "sounds.h" #include "collide.h" #include "lighting.h" #include "newdemo.h" +#include "newmenu.h" #include "gameseq.h" #include "hudmsg.h" -#include "gamesave.h" -#include "gamemine.h" #include "switch.h" #include "gauges.h" #include "player.h" @@ -90,10 +81,6 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "controls.h" #include "playsave.h" -#if DXX_USE_EDITOR -#include "editor/editor.h" -#endif - #include "compiler-range_for.h" #include "d_levelstate.h" #include "partial_range.h" diff --git a/similar/main/newmenu.cpp b/similar/main/newmenu.cpp index e54b09082..5264b1442 100644 --- a/similar/main/newmenu.cpp +++ b/similar/main/newmenu.cpp @@ -33,45 +33,27 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "pstypes.h" #include "dxxerror.h" #include "gr.h" -#include "grdef.h" #include "window.h" -#include "songs.h" #include "key.h" #include "mouse.h" #include "palette.h" #include "game.h" #include "text.h" -#include "menu.h" #include "newmenu.h" -#include "iff.h" #include "pcx.h" #include "u_mem.h" #include "mouse.h" #include "joy.h" -#include "digi.h" -#include "multi.h" -#include "endlevel.h" -#include "screens.h" -#include "config.h" -#include "player.h" -#include "state.h" #include "newdemo.h" #include "kconfig.h" #include "strutil.h" #include "vers_id.h" #include "timer.h" -#include "playsave.h" -#include "automap.h" -#include "rbaudio.h" #include "args.h" #if defined(DXX_BUILD_DESCENT_II) #include "gamepal.h" #endif -#if DXX_USE_OGL -#include "ogl_init.h" -#endif - #include "compiler-range_for.h" #include "d_zip.h" #include "partial_range.h" diff --git a/similar/main/object.cpp b/similar/main/object.cpp index b56fb73f1..03aab14f8 100644 --- a/similar/main/object.cpp +++ b/similar/main/object.cpp @@ -51,7 +51,6 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "laser.h" #include "dxxerror.h" #include "ai.h" -#include "hostage.h" #include "morph.h" #include "cntrlcen.h" #include "powerup.h" @@ -64,11 +63,8 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "newdemo.h" #include "player.h" #include "weapon.h" -#include "newmenu.h" #include "gauges.h" #include "multi.h" -#include "menu.h" -#include "args.h" #include "text.h" #include "piggy.h" #include "switch.h" diff --git a/similar/main/paging.cpp b/similar/main/paging.cpp index 01921151c..fa0df358f 100644 --- a/similar/main/paging.cpp +++ b/similar/main/paging.cpp @@ -34,28 +34,21 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "textures.h" #include "wall.h" #include "object.h" -#include "gamemine.h" -#include "dxxerror.h" #include "console.h" -#include "gameseg.h" #include "game.h" #include "piggy.h" #include "texmerge.h" #include "paging.h" -#include "laser.h" #include "robot.h" #include "vclip.h" #include "effects.h" #include "fireball.h" #include "weapon.h" #include "palette.h" -#include "timer.h" #include "text.h" -#include "cntrlcen.h" #include "gauges.h" #include "powerup.h" #include "fuelcen.h" -#include "mission.h" #include "ai.h" #include "compiler-range_for.h" diff --git a/similar/main/physics.cpp b/similar/main/physics.cpp index a6010255b..b944c5e8f 100644 --- a/similar/main/physics.cpp +++ b/similar/main/physics.cpp @@ -35,14 +35,10 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "object.h" #include "physics.h" #include "robot.h" -#include "key.h" #include "game.h" #include "collide.h" #include "fvi.h" -#include "newdemo.h" #include "gameseg.h" -#include "timer.h" -#include "ai.h" #include "wall.h" #include "laser.h" #if defined(DXX_BUILD_DESCENT_II) diff --git a/similar/main/piggy.cpp b/similar/main/piggy.cpp index 386488787..792e4df88 100644 --- a/similar/main/piggy.cpp +++ b/similar/main/piggy.cpp @@ -30,22 +30,19 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "strutil.h" #include "inferno.h" #include "gr.h" -#include "grdef.h" #include "u_mem.h" #include "iff.h" #include "dxxerror.h" #include "sounds.h" -#include "songs.h" +#include "digi.h" #include "bm.h" #include "hash.h" #include "common/2d/bitmap.h" #include "args.h" #include "palette.h" -#include "gamefont.h" #include "gamepal.h" #include "physfsx.h" #include "rle.h" -#include "screens.h" #include "piggy.h" #include "gamemine.h" #include "textures.h" @@ -54,7 +51,6 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "game.h" #include "text.h" #include "vclip.h" -#include "newmenu.h" #include "makesig.h" #include "console.h" #include "compiler-cf_assert.h" diff --git a/similar/main/playsave.cpp b/similar/main/playsave.cpp index 3a3460727..c8977cb61 100644 --- a/similar/main/playsave.cpp +++ b/similar/main/playsave.cpp @@ -36,19 +36,15 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "dxxerror.h" #include "strutil.h" #include "game.h" -#include "gameseq.h" #include "player.h" #include "playsave.h" #include "joy.h" #include "digi.h" #include "newmenu.h" #include "palette.h" -#include "menu.h" #include "config.h" #include "text.h" -#include "state.h" #include "gauges.h" -#include "screens.h" #include "powerup.h" #include "makesig.h" #include "u_mem.h" diff --git a/similar/main/polyobj.cpp b/similar/main/polyobj.cpp index 2977c4f8a..c520bd75a 100644 --- a/similar/main/polyobj.cpp +++ b/similar/main/polyobj.cpp @@ -35,11 +35,9 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "interp.h" #include "dxxerror.h" #include "u_mem.h" -#include "args.h" #include "physfs-serial.h" #include "physfsx.h" #ifndef DRIVE -#include "texmap.h" #include "bm.h" #include "textures.h" #include "object.h" diff --git a/similar/main/powerup.cpp b/similar/main/powerup.cpp index a784a3a57..11796e07c 100644 --- a/similar/main/powerup.cpp +++ b/similar/main/powerup.cpp @@ -36,7 +36,6 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "inferno.h" #include "object.h" #include "game.h" -#include "key.h" #include "fireball.h" #include "powerup.h" #include "gauges.h" @@ -49,19 +48,18 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "scores.h" #include "multi.h" #include "segment.h" -#include "lighting.h" #include "controls.h" #include "kconfig.h" #include "newdemo.h" #include "escort.h" #if DXX_USE_EDITOR #include "gr.h" // for powerup outline drawing -#include "editor/editor.h" #endif #include "hudmsg.h" #include "playsave.h" #include "d_levelstate.h" #include "partial_range.h" +#include "vclip.h" namespace dcx { unsigned N_powerup_types; diff --git a/similar/main/render.cpp b/similar/main/render.cpp index 47408de25..63ba8988d 100644 --- a/similar/main/render.cpp +++ b/similar/main/render.cpp @@ -39,23 +39,16 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "render.h" #include "game.h" #include "object.h" -#include "laser.h" #include "textures.h" -#include "screens.h" #include "segpoint.h" #include "wall.h" #include "texmerge.h" -#include "physics.h" #include "3d.h" #include "gameseg.h" #include "vclip.h" #include "lighting.h" -#include "cntrlcen.h" #include "newdemo.h" -#include "automap.h" #include "endlevel.h" -#include "key.h" -#include "newmenu.h" #include "u_mem.h" #include "piggy.h" #include "timer.h" diff --git a/similar/main/robot.cpp b/similar/main/robot.cpp index 4d4e0c649..e0a6f88c4 100644 --- a/similar/main/robot.cpp +++ b/similar/main/robot.cpp @@ -27,6 +27,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "dxxerror.h" #include "inferno.h" #include "robot.h" +#include "ai.h" #include "object.h" #include "polyobj.h" #include "physfsx.h" diff --git a/similar/main/scores.cpp b/similar/main/scores.cpp index 179aeea4f..c008dad07 100644 --- a/similar/main/scores.cpp +++ b/similar/main/scores.cpp @@ -50,16 +50,11 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "timer.h" #include "text.h" #include "strutil.h" -#include "rbaudio.h" #include "physfsx.h" #include "compiler-range_for.h" #include "d_levelstate.h" #include "d_range.h" -#if DXX_USE_OGL -#include "ogl_init.h" -#endif - #define VERSION_NUMBER 1 #define SCORES_FILENAME "descent.hi" #define COOL_MESSAGE_LEN 50 diff --git a/similar/main/slew.cpp b/similar/main/slew.cpp index 1a0038eeb..4308a652c 100644 --- a/similar/main/slew.cpp +++ b/similar/main/slew.cpp @@ -28,20 +28,13 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "inferno.h" #include "game.h" #include "vecmat.h" -#include "key.h" #include "joy.h" #include "object.h" -#include "dxxerror.h" -#include "physics.h" #include "kconfig.h" #include "slew.h" #include "segment.h" #include "d_levelstate.h" -#if DXX_USE_EDITOR -#include "editor/editor.h" -#endif - //variables for slew system diff --git a/similar/main/songs.cpp b/similar/main/songs.cpp index 7c50ed69c..43a72474a 100644 --- a/similar/main/songs.cpp +++ b/similar/main/songs.cpp @@ -39,7 +39,6 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #endif #include "jukebox.h" #include "config.h" -#include "timer.h" #include "u_mem.h" #include "args.h" #include "physfsx.h" diff --git a/similar/main/state.cpp b/similar/main/state.cpp index c38b6ae96..7e12ff265 100644 --- a/similar/main/state.cpp +++ b/similar/main/state.cpp @@ -34,10 +34,8 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "textures.h" #include "wall.h" #include "object.h" -#include "gamemine.h" #include "dxxerror.h" #include "console.h" -#include "config.h" #include "gamefont.h" #include "gameseg.h" #include "switch.h" @@ -45,7 +43,6 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "newmenu.h" #include "fuelcen.h" #include "hash.h" -#include "key.h" #include "piggy.h" #include "player.h" #include "playsave.h" @@ -56,22 +53,16 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "gameseq.h" #include "event.h" #include "robot.h" -#include "gauges.h" #include "newdemo.h" #include "automap.h" #include "piggy.h" -#include "paging.h" -#include "titles.h" #include "text.h" #include "mission.h" -#include "pcx.h" -#include "collide.h" #include "u_mem.h" #include "args.h" #include "ai.h" #include "fireball.h" #include "controls.h" -#include "laser.h" #include "hudmsg.h" #include "state.h" #include "multi.h" @@ -85,7 +76,6 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #endif #include "compiler-range_for.h" -#include "d_enumerate.h" #include "d_levelstate.h" #include "d_range.h" #include "partial_range.h" diff --git a/similar/main/switch.cpp b/similar/main/switch.cpp index a129c637d..97b5774f1 100644 --- a/similar/main/switch.cpp +++ b/similar/main/switch.cpp @@ -29,7 +29,6 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include #include -#include "gauges.h" #include "newmenu.h" #include "game.h" #include "switch.h" @@ -38,10 +37,8 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "dxxerror.h" #include "gameseg.h" #include "wall.h" -#include "texmap.h" #include "object.h" #include "fuelcen.h" -#include "cntrlcen.h" #include "newdemo.h" #include "player.h" #include "endlevel.h" @@ -52,10 +49,6 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "robot.h" #include "bm.h" -#if DXX_USE_EDITOR -#include "editor/editor.h" -#endif - #include "physfs-serial.h" #include "d_levelstate.h" #include "compiler-range_for.h" diff --git a/similar/main/terrain.cpp b/similar/main/terrain.cpp index 7795d24dc..ddb460c6a 100644 --- a/similar/main/terrain.cpp +++ b/similar/main/terrain.cpp @@ -38,7 +38,6 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "textures.h" #include "object.h" #include "endlevel.h" -#include "fireball.h" #include "render.h" #include "player.h" #include "segment.h" diff --git a/similar/main/texmerge.cpp b/similar/main/texmerge.cpp index 0e376cf95..655de3432 100644 --- a/similar/main/texmerge.cpp +++ b/similar/main/texmerge.cpp @@ -26,7 +26,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "gr.h" #include "dxxerror.h" -#include "game.h" +#include "fmtcheck.h" #include "textures.h" #include "rle.h" #include "timer.h" diff --git a/similar/main/text.cpp b/similar/main/text.cpp index d890cf26f..bf0009b74 100644 --- a/similar/main/text.cpp +++ b/similar/main/text.cpp @@ -29,9 +29,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "physfsx.h" #include "pstypes.h" -#include "u_mem.h" #include "dxxerror.h" -#include "inferno.h" #include "text.h" #include "strutil.h" #include "args.h" diff --git a/similar/main/titles.cpp b/similar/main/titles.cpp index 90acffcc7..4ea4dc28a 100644 --- a/similar/main/titles.cpp +++ b/similar/main/titles.cpp @@ -50,18 +50,13 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "textures.h" #include "screens.h" #include "multi.h" -#include "player.h" #include "digi.h" #include "text.h" -#include "kmatrix.h" #include "piggy.h" #include "songs.h" -#include "newmenu.h" -#include "state.h" #if defined(DXX_BUILD_DESCENT_II) #include "movie.h" #endif -#include "menu.h" #include "mouse.h" #include "console.h" #include "args.h" diff --git a/similar/main/vclip.cpp b/similar/main/vclip.cpp index c7887c9eb..3f77f5dd8 100644 --- a/similar/main/vclip.cpp +++ b/similar/main/vclip.cpp @@ -27,15 +27,12 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include #include "dxxerror.h" #include "inferno.h" +#include "laser.h" #include "vclip.h" #include "physfs-serial.h" #include "render.h" #include "weapon.h" #include "object.h" -#if defined(DXX_BUILD_DESCENT_II) -#include "laser.h" -#endif - #include "compiler-range_for.h" //----------------- Variables for video clips ------------------- diff --git a/similar/main/wall.cpp b/similar/main/wall.cpp index d9fb826f6..e3630309e 100644 --- a/similar/main/wall.cpp +++ b/similar/main/wall.cpp @@ -18,7 +18,6 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. */ #include "wall.h" -#include "player.h" #include "text.h" #include "fireball.h" #include "textures.h" @@ -28,7 +27,6 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "physfs-serial.h" #include "gameseg.h" #include "hudmsg.h" -#include "laser.h" // For seeing if a flare is stuck in a wall. #include "effects.h" #include "d_enumerate.h" diff --git a/similar/main/weapon.cpp b/similar/main/weapon.cpp index 79ce8915c..873243967 100644 --- a/similar/main/weapon.cpp +++ b/similar/main/weapon.cpp @@ -34,23 +34,18 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "laser.h" #include "weapon.h" #include "player.h" -#include "gauges.h" #include "dxxerror.h" #include "sounds.h" #include "text.h" #include "powerup.h" -#include "fireball.h" #include "newdemo.h" #include "multi.h" #include "object.h" #include "segment.h" #include "newmenu.h" -#include "gamemine.h" -#include "ai.h" -#include "args.h" #include "playsave.h" #include "physfs-serial.h" - +#include "vclip.h" #include "compiler-range_for.h" #include "d_enumerate.h" #include "d_levelstate.h" diff --git a/similar/misc/args.cpp b/similar/misc/args.cpp index 4dcaf0ed4..e40885d7c 100644 --- a/similar/misc/args.cpp +++ b/similar/misc/args.cpp @@ -22,7 +22,6 @@ #include "strutil.h" #include "digi.h" #include "game.h" -#include "gauges.h" #include "console.h" #include "mission.h" #if DXX_USE_UDP