From d9db50df48f4a212daa4cbe84d05be9464002a42 Mon Sep 17 00:00:00 2001 From: Bradley Bell Date: Thu, 29 Jan 2015 01:12:45 -0800 Subject: [PATCH] header fixes --- main/ai.c | 32 ---------------------------- main/ai2.c | 27 ------------------------ main/aipath.c | 11 +--------- main/automap.c | 31 --------------------------- main/bm.c | 22 ------------------- main/bmread.c | 27 ------------------------ main/cntrlcen.c | 16 +------------- main/collide.c | 47 ----------------------------------------- main/config.c | 7 ------- main/console.c | 4 +--- main/controls.c | 16 +------------- main/credits.c | 13 +----------- main/digiobj.c | 8 +------ main/effects.c | 5 ----- main/endlevel.c | 23 +------------------- main/escort.c | 23 -------------------- main/fireball.c | 31 +-------------------------- main/fuelcen.c | 26 +---------------------- main/fvi.c | 9 +------- main/game.c | 51 -------------------------------------------- main/gamecntl.c | 51 +------------------------------------------- main/inferno.h | 56 ++++++++++++++++++++++++++++++++++--------------- main/state.c | 37 -------------------------------- main/titles.h | 2 +- ui/file.c | 1 + ui/keypress.c | 2 ++ ui/menu.c | 1 + ui/menubar.c | 1 + ui/message.c | 2 ++ ui/number.c | 2 ++ ui/popup.c | 1 + 31 files changed, 61 insertions(+), 524 deletions(-) diff --git a/main/ai.c b/main/ai.c index 11ecb2c7..2e2dd2cc 100644 --- a/main/ai.c +++ b/main/ai.c @@ -27,43 +27,11 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include #include "inferno.h" -#include "game.h" #include "mono.h" #include "3d.h" - -#include "object.h" -#include "render.h" #include "error.h" -#include "ai.h" -#include "laser.h" -#include "fvi.h" -#include "polyobj.h" -#include "bm.h" -#include "weapon.h" -#include "physics.h" -#include "collide.h" -#include "player.h" -#include "wall.h" -#include "vclip.h" -#include "fireball.h" -#include "morph.h" -#include "effects.h" #include "timer.h" -#include "sounds.h" -#include "cntrlcen.h" -#include "multibot.h" -#ifdef NETWORK -#include "multi.h" -#include "network.h" -#endif -#include "gameseq.h" #include "key.h" -#include "powerup.h" -#include "gauges.h" -#include "text.h" -#include "fuelcen.h" -#include "controls.h" -#include "kconfig.h" #ifdef EDITOR #include "editor/editor.h" diff --git a/main/ai2.c b/main/ai2.c index 0fe5bcbe..fe757dbf 100644 --- a/main/ai2.c +++ b/main/ai2.c @@ -26,42 +26,15 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include #include "inferno.h" -#include "game.h" #include "mono.h" #include "3d.h" #include "u_mem.h" -#include "object.h" -#include "render.h" #include "error.h" #include "ai.h" -#include "laser.h" -#include "fvi.h" -#include "polyobj.h" -#include "bm.h" -#include "weapon.h" -#include "physics.h" -#include "collide.h" -#include "player.h" -#include "wall.h" -#include "vclip.h" #include "digi.h" -#include "fireball.h" -#include "morph.h" -#include "effects.h" #include "timer.h" -#include "sounds.h" -#include "cntrlcen.h" -#include "multibot.h" -#ifdef NETWORK -#include "multi.h" -#include "network.h" -#endif -#include "gameseq.h" #include "key.h" -#include "powerup.h" -#include "gauges.h" -#include "text.h" #ifdef EDITOR #include "editor/editor.h" diff --git a/main/aipath.c b/main/aipath.c index 5dd06e46..13918132 100644 --- a/main/aipath.c +++ b/main/aipath.c @@ -28,20 +28,11 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "inferno.h" #include "mono.h" #include "3d.h" - -#include "object.h" #include "error.h" -#include "ai.h" -#include "robot.h" -#include "fvi.h" -#include "physics.h" -#include "wall.h" #ifdef EDITOR #include "editor/editor.h" #endif -#include "player.h" -#include "fireball.h" -#include "game.h" + #define PARALLAX 0 // If !0, then special debugging for Parallax eyes enabled. diff --git a/main/automap.c b/main/automap.c index 28474fc7..749d2d51 100644 --- a/main/automap.c +++ b/main/automap.c @@ -33,45 +33,14 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "3d.h" #include "inferno.h" #include "u_mem.h" -#include "render.h" -#include "object.h" -#include "vclip.h" -#include "game.h" #include "mono.h" -#include "polyobj.h" -#include "sounds.h" -#include "player.h" -#include "bm.h" #include "key.h" -#include "newmenu.h" -#include "menu.h" -#include "screens.h" -#include "textures.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 "gameseq.h" -#include "gamefont.h" -#ifdef NETWORK -#include "network.h" -#endif -#include "kconfig.h" -#ifdef NETWORK -#include "multi.h" -#endif -#include "endlevel.h" -#include "text.h" -#include "gauges.h" -#include "songs.h" -#include "powerup.h" -#include "switch.h" -#include "automap.h" -#include "cntrlcen.h" #include "vid.h" diff --git a/main/bm.c b/main/bm.c index 0aa45847..4f8f823e 100644 --- a/main/bm.c +++ b/main/bm.c @@ -25,35 +25,13 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include #include -#include "pstypes.h" #include "inferno.h" #include "gr.h" -#include "bm.h" #include "u_mem.h" #include "mono.h" #include "error.h" -#include "object.h" -#include "vclip.h" -#include "effects.h" -#include "polyobj.h" -#include "wall.h" -#include "textures.h" -#include "game.h" -#ifdef NETWORK -#include "multi.h" -#endif #include "iff.h" #include "cfile.h" -#include "powerup.h" -#include "sounds.h" -#include "piggy.h" -#include "aistruct.h" -#include "robot.h" -#include "weapon.h" -#include "gauges.h" -#include "player.h" -#include "endlevel.h" -#include "cntrlcen.h" #include "makesig.h" #include "interp.h" diff --git a/main/bmread.c b/main/bmread.c index f0c81d88..2cb26f43 100644 --- a/main/bmread.c +++ b/main/bmread.c @@ -28,42 +28,15 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include #include -#include "pstypes.h" #include "inferno.h" #include "gr.h" #include "bm.h" -#include "gamepal.h" #include "u_mem.h" #include "mono.h" #include "error.h" -#include "object.h" -#include "vclip.h" -#include "effects.h" -#include "polyobj.h" -#include "wall.h" -#include "textures.h" -#include "game.h" -#ifdef NETWORK -#include "multi.h" -#endif - #include "iff.h" #include "cfile.h" - -#include "hostage.h" -#include "powerup.h" -#include "laser.h" -#include "sounds.h" -#include "piggy.h" -#include "aistruct.h" -#include "robot.h" -#include "weapon.h" -#include "gauges.h" -#include "player.h" -#include "endlevel.h" -#include "cntrlcen.h" #include "args.h" -#include "text.h" #include "interp.h" #include "strutil.h" diff --git a/main/cntrlcen.c b/main/cntrlcen.c index 9c7741c2..ef03a566 100644 --- a/main/cntrlcen.c +++ b/main/cntrlcen.c @@ -27,25 +27,11 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include #endif -#include "pstypes.h" #include "error.h" #include "mono.h" #include "inferno.h" -#include "cntrlcen.h" -#include "game.h" -#include "laser.h" -#include "gameseq.h" -#include "ai.h" -#ifdef NETWORK -#include "multi.h" -#endif -#include "wall.h" -#include "object.h" -#include "robot.h" -#include "vclip.h" -#include "fireball.h" -#include "endlevel.h" + //@@vms_vector controlcen_gun_points[MAX_CONTROLCEN_GUNS]; //@@vms_vector controlcen_gun_dirs[MAX_CONTROLCEN_GUNS]; diff --git a/main/collide.c b/main/collide.c index f0feadc3..017c67d6 100644 --- a/main/collide.c +++ b/main/collide.c @@ -26,57 +26,12 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "rle.h" #include "inferno.h" -#include "game.h" #include "gr.h" #include "stdlib.h" -#include "bm.h" -//#include "error.h" #include "mono.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" -#include "fireball.h" -#include "laser.h" #include "error.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" -#ifdef NETWORK -#include "network.h" -#endif -#include "newmenu.h" -#include "scores.h" -#include "effects.h" -#include "textures.h" -#ifdef NETWORK -#include "multi.h" -#endif -#include "cntrlcen.h" -#include "newdemo.h" -#include "endlevel.h" -#include "multibot.h" -#include "piggy.h" -#include "text.h" -#include "automap.h" -#include "switch.h" -#include "palette.h" -#include "gameseq.h" #ifdef TACTILE #include "tactile.h" @@ -86,8 +41,6 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "editor/editor.h" #endif -#include "collide.h" -#include "escort.h" #define STANDARD_EXPL_DELAY (f1_0/4) diff --git a/main/config.c b/main/config.c index eff38f62..d3a17db8 100644 --- a/main/config.c +++ b/main/config.c @@ -37,20 +37,13 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include #include "inferno.h" -#include "menu.h" -#include "movie.h" #include "digi.h" -#include "kconfig.h" #include "palette.h" #include "joy.h" -#include "songs.h" #include "args.h" -#include "player.h" -#include "mission.h" #include "mono.h" #include "key.h" #include "physfsx.h" -#include "multi.h" #ifdef __MSDOS__ diff --git a/main/console.c b/main/console.c index a9ffa097..7b21fd35 100644 --- a/main/console.c +++ b/main/console.c @@ -24,8 +24,7 @@ #include #include -#include "console.h" - +#include "inferno.h" #include "u_mem.h" #include "gr.h" #include "key.h" @@ -33,7 +32,6 @@ #include "pstypes.h" #include "error.h" #include "cvar.h" -#include "gamefont.h" #include "pcx.h" #include "cfile.h" diff --git a/main/controls.c b/main/controls.c index 86acc210..0e36994b 100644 --- a/main/controls.c +++ b/main/controls.c @@ -24,31 +24,17 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include #include -#include "pstypes.h" #include "mono.h" #include "key.h" #include "joy.h" #include "timer.h" #include "error.h" - #include "inferno.h" -#include "game.h" -#include "object.h" -#include "player.h" - -#include "controls.h" #include "joydefs.h" -#include "render.h" #include "args.h" #include "palette.h" #include "mouse.h" -#include "kconfig.h" -#include "laser.h" -#ifdef NETWORK -#include "multi.h" -#endif -#include "vclip.h" -#include "fireball.h" + //look at keyboard, mouse, joystick, CyberMan, whatever, and set //physics vars rotvel, velocity diff --git a/main/credits.c b/main/credits.c index ec30b3a4..7c7daafb 100644 --- a/main/credits.c +++ b/main/credits.c @@ -28,32 +28,21 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include #include "error.h" -#include "pstypes.h" #include "gr.h" #include "vid.h" #include "mono.h" #include "key.h" #include "inferno.h" -#include "gamepal.h" #include "timer.h" - -#include "newmenu.h" -#include "gamefont.h" -#ifdef NETWORK -#include "network.h" -#endif #include "iff.h" #include "pcx.h" #include "u_mem.h" #include "mouse.h" #include "joy.h" -#include "screens.h" #include "digi.h" #include "cfile.h" -#include "text.h" -#include "songs.h" -#include "menu.h" // for MenuHires + #define ROW_SPACING (MenuHires?26:11) #define NUM_LINES_HIRES 21 diff --git a/main/digiobj.c b/main/digiobj.c index 41c84bf7..d00e01a2 100644 --- a/main/digiobj.c +++ b/main/digiobj.c @@ -36,20 +36,14 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "timer.h" #include "joy.h" #include "digi.h" -#include "sounds.h" #include "args.h" #include "key.h" -#include "newdemo.h" -#include "game.h" #ifdef __MSDOS__ #include "dpmi.h" #endif #include "error.h" -#include "wall.h" #include "cfile.h" -#include "piggy.h" -#include "text.h" -#include "kconfig.h" + #define SOF_USED 1 // Set if this sample is used #define SOF_PLAYING 2 // Set if this sample is playing on a channel diff --git a/main/effects.c b/main/effects.c index 4dbc8279..0d71ed5e 100644 --- a/main/effects.c +++ b/main/effects.c @@ -29,14 +29,9 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "gr.h" #include "inferno.h" -#include "game.h" #include "vclip.h" -#include "effects.h" -#include "bm.h" #include "mono.h" #include "u_mem.h" -#include "textures.h" -#include "cntrlcen.h" #include "error.h" int Num_effects; diff --git a/main/endlevel.c b/main/endlevel.c index 8190fc14..56cfe961 100644 --- a/main/endlevel.c +++ b/main/endlevel.c @@ -45,30 +45,9 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "u_mem.h" #include "sounds.h" -#include "inferno.h" -#include "endlevel.h" -#include "object.h" -#include "game.h" -#include "screens.h" -#include "gauges.h" -#include "wall.h" -#include "terrain.h" -#include "polyobj.h" -#include "bm.h" -#include "gameseq.h" -#include "newdemo.h" -#include "multi.h" -#include "vclip.h" -#include "fireball.h" -#ifdef NETWORK -#include "network.h" -#endif -#include "text.h" #include "digi.h" #include "cfile.h" -#include "songs.h" -#include "movie.h" -#include "render.h" + typedef struct flythrough_data { object *obj; diff --git a/main/escort.c b/main/escort.c index 1d1002f5..5fceedcc 100644 --- a/main/escort.c +++ b/main/escort.c @@ -32,31 +32,8 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "gr.h" #include "3d.h" #include "vid.h" - -#include "object.h" #include "error.h" -#include "ai.h" -#include "robot.h" -#include "fvi.h" -#include "physics.h" -#include "wall.h" -#include "player.h" -#include "fireball.h" -#include "game.h" -#include "powerup.h" -#include "cntrlcen.h" -#include "gauges.h" #include "key.h" -#include "fuelcen.h" -#include "sounds.h" -#include "screens.h" -#include "text.h" -#include "gamefont.h" -#include "newmenu.h" -#include "gameseq.h" -#include "automap.h" -#include "laser.h" -#include "escort.h" #ifdef EDITOR #include "editor/editor.h" diff --git a/main/fireball.c b/main/fireball.c index 556f5eed..f5693c22 100644 --- a/main/fireball.c +++ b/main/fireball.c @@ -32,38 +32,9 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "3d.h" #include "inferno.h" -#include "object.h" -#include "vclip.h" -#include "game.h" #include "mono.h" -#include "polyobj.h" -#include "sounds.h" -#include "player.h" -#include "gauges.h" -#include "powerup.h" -#include "bm.h" -#include "ai.h" -#include "weapon.h" -#include "fireball.h" -#include "collide.h" -#include "newmenu.h" -#ifdef NETWORK -#include "network.h" -#endif -#include "gameseq.h" -#include "physics.h" -#include "scores.h" -#include "laser.h" -#include "wall.h" -#ifdef NETWORK -#include "multi.h" -#endif -#include "endlevel.h" #include "timer.h" -#include "fuelcen.h" -#include "cntrlcen.h" -#include "gameseg.h" -#include "automap.h" + #define EXPLOSION_SCALE (F1_0*5/2) //explosion is the obj size times this diff --git a/main/fuelcen.c b/main/fuelcen.c index ad180ec9..19169702 100644 --- a/main/fuelcen.c +++ b/main/fuelcen.c @@ -27,34 +27,10 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include #include "inferno.h" -#include "gameseg.h" -#include "game.h" // For FrameTime #include "error.h" #include "mono.h" -#include "gauges.h" -#include "vclip.h" -#include "fireball.h" -#include "robot.h" -#include "powerup.h" - -#include "wall.h" -#include "sounds.h" -#include "morph.h" #include "3d.h" -#include "bm.h" -#include "polyobj.h" -#include "ai.h" -#include "gamemine.h" -#include "gamesave.h" -#include "player.h" -#include "collide.h" -#include "laser.h" -#ifdef NETWORK -#include "network.h" -#include "multi.h" -#endif -#include "multibot.h" -#include "escort.h" + // The max number of fuel stations per mine. diff --git a/main/fvi.c b/main/fvi.c index 3cf53a15..c369851e 100644 --- a/main/fvi.c +++ b/main/fvi.c @@ -38,15 +38,8 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "mono.h" #include "inferno.h" -#include "fvi.h" -#include "segment.h" -#include "object.h" -#include "wall.h" -#include "laser.h" #include "rle.h" -#include "robot.h" -#include "piggy.h" -#include "player.h" + extern int Physics_cheat_flag; diff --git a/main/game.c b/main/game.c index 317d5569..e6f1dff1 100644 --- a/main/game.c +++ b/main/game.c @@ -41,75 +41,24 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "ogl_init.h" #endif -#include "pstypes.h" -#include "console.h" #include "gr.h" #include "inferno.h" -#include "game.h" #include "key.h" -#include "object.h" -#include "physics.h" #include "error.h" #include "joy.h" #include "mono.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" -#include "gameseg.h" -#include "wall.h" -#include "ai.h" -#include "fuelcen.h" -#include "digi.h" #include "ibitblt.h" #include "u_mem.h" #include "palette.h" -#include "morph.h" -#include "lighting.h" -#include "newdemo.h" -#include "collide.h" -#include "weapon.h" -#include "sounds.h" #include "args.h" -#include "gameseq.h" -#include "automap.h" -#include "text.h" -#include "powerup.h" -#include "fireball.h" -#include "newmenu.h" -#ifdef NETWORK -#include "network.h" -#endif -#include "gamefont.h" -#include "endlevel.h" -#include "joydefs.h" -#include "kconfig.h" #include "mouse.h" -#include "switch.h" -#include "controls.h" -#include "songs.h" -#include "gamepal.h" - -#include "multi.h" -#include "desc_id.h" -#include "cntrlcen.h" #include "pcx.h" -#include "state.h" -#include "piggy.h" -#include "multibot.h" -#include "ai.h" -#include "robot.h" #include "fix.h" -#include "hudmsg.h" #include "vid.h" #ifdef MWPROFILER diff --git a/main/gamecntl.c b/main/gamecntl.c index d2212a60..48466fd8 100644 --- a/main/gamecntl.c +++ b/main/gamecntl.c @@ -28,79 +28,30 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include #include -#include "pstypes.h" -#include "console.h" #include "inferno.h" -#include "game.h" -#include "player.h" #include "key.h" -#include "object.h" -#include "menu.h" -#include "physics.h" #include "error.h" #include "joy.h" #include "mono.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 "gameseg.h" -#include "wall.h" -#include "ai.h" #include "digi.h" #include "ibitblt.h" #include "u_mem.h" -#include "morph.h" -#include "lighting.h" -#include "newdemo.h" -#include "weapon.h" -#include "sounds.h" #include "args.h" -#include "gameseq.h" -#include "automap.h" -#include "text.h" -#include "powerup.h" -#include "newmenu.h" -#ifdef NETWORK -#include "network.h" -#endif -#include "gamefont.h" -#include "endlevel.h" -#include "joydefs.h" -#include "kconfig.h" #include "mouse.h" -#include "titles.h" #include "gr.h" #include "vid.h" -#include "movie.h" -#include "scores.h" -#ifdef MACINTOSH -#include "songs.h" -#endif #if defined (TACTILE) #include "tactile.h" #endif -#include "multi.h" -#include "desc_id.h" -#include "cntrlcen.h" #include "pcx.h" -#include "state.h" -#include "piggy.h" -#include "multibot.h" -#include "ai.h" #include "rbaudio.h" -#include "switch.h" -#include "escort.h" + //#define TEST_TIMER 1 //if this is set, do checking on timer diff --git a/main/inferno.h b/main/inferno.h index ba1a6aba..4e422255 100644 --- a/main/inferno.h +++ b/main/inferno.h @@ -61,36 +61,58 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #define MAX_SUBMODELS 10 // how many animating sub-objects per model -#include "console.h" -#include "escort.h" -#include "segment.h" -#include "object.h" -#include "automap.h" -#ifdef NETWORK -#include "multi.h" -#include "network.h" -#endif -#include "fvi.h" -#include "menu.h" -#include "fuelcen.h" -#include "robot.h" -#include "gauges.h" -#include "screens.h" -#include "powerup.h" -#include "state.h" #include "ai.h" +#include "automap.h" #include "bm.h" #include "cntrlcen.h" +#include "collide.h" #include "config.h" +#include "console.h" #include "controls.h" +#include "effects.h" #include "endlevel.h" +#include "escort.h" +#include "fuelcen.h" +#include "fvi.h" #include "gamefont.h" +#include "gamemine.h" +#include "gamepal.h" +#include "gamesave.h" +#include "gauges.h" +#include "hostage.h" +#include "hudmsg.h" #include "fireball.h" +#include "joydefs.h" #include "kconfig.h" #include "laser.h" +#include "lighting.h" +#include "menu.h" +#include "morph.h" +#include "movie.h" +#include "multibot.h" +#ifdef NETWORK +#include "multi.h" +#include "network.h" +#endif +#include "newdemo.h" +#include "object.h" +#include "physics.h" #include "polyobj.h" +#include "powerup.h" +#include "render.h" +#include "robot.h" +#include "scores.h" +#include "segment.h" +#include "segpoint.h" #include "songs.h" +#include "screens.h" +#include "slew.h" +#include "state.h" +#include "switch.h" +#include "terrain.h" #include "text.h" +#include "textures.h" +#include "titles.h" #include "wall.h" diff --git a/main/state.c b/main/state.c index 8721e540..ef8b62cc 100644 --- a/main/state.c +++ b/main/state.c @@ -39,53 +39,16 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include #endif -#include "pstypes.h" #include "mono.h" #include "inferno.h" -#include "segment.h" -#include "textures.h" -#include "wall.h" -#include "object.h" #include "digi.h" -#include "gamemine.h" #include "error.h" -#include "gameseg.h" -#include "menu.h" -#include "switch.h" -#include "game.h" -#include "screens.h" -#include "newmenu.h" #include "cfile.h" -#include "fuelcen.h" #include "hash.h" #include "key.h" -#include "piggy.h" -#include "player.h" -#include "cntrlcen.h" -#include "morph.h" -#include "weapon.h" -#include "render.h" -#include "gameseq.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 "u_mem.h" -#ifdef NETWORK -#include "network.h" -#endif #include "args.h" -#include "ai.h" -#include "fireball.h" -#include "controls.h" -#include "laser.h" -#include "multibot.h" -#include "state.h" #include "physfsx.h" #ifdef OGL #include "ogl_init.h" diff --git a/main/titles.h b/main/titles.h index 04f9fad7..dc84bcd1 100644 --- a/main/titles.h +++ b/main/titles.h @@ -28,7 +28,7 @@ extern int Skip_briefing_screens; extern void show_titles(void); extern void show_loading_screen(ubyte *title_pal); -extern int show_briefing_screen( char * filename, int allow_keys ); +extern int show_briefing_screen( int screen_num, int allow_keys ); extern void show_title_flick(char *name, int allow_keys ); extern void do_briefing_screens(char *filename,int level_num); extern char * get_briefing_screen( int level_num ); diff --git a/ui/file.c b/ui/file.c index 46fbd00a..0ceeece5 100644 --- a/ui/file.c +++ b/ui/file.c @@ -19,6 +19,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "pstypes.h" #include "gr.h" #include "key.h" +#include "vid.h" #include "strutil.h" #include "ui.h" diff --git a/ui/keypress.c b/ui/keypress.c index 5c3b1504..bd3ee5c3 100644 --- a/ui/keypress.c +++ b/ui/keypress.c @@ -24,6 +24,8 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "gr.h" #include "ui.h" #include "key.h" +#include "vid.h" + char * KeyDesc[256] = { \ "","{Esc}","{1}","{2}","{3}","{4}","{5}","{6}","{7}","{8}","{9}","{0}","{-}", \ diff --git a/ui/menu.c b/ui/menu.c index 6979184c..ff7c77d3 100644 --- a/ui/menu.c +++ b/ui/menu.c @@ -22,6 +22,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "pstypes.h" #include "gr.h" #include "ui.h" +#include "vid.h" #define MENU_BORDER 2 diff --git a/ui/menubar.c b/ui/menubar.c index a393ea90..ab5769e5 100644 --- a/ui/menubar.c +++ b/ui/menubar.c @@ -25,6 +25,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "gr.h" #include "ui.h" #include "key.h" +#include "vid.h" #include "cfile.h" #include "mono.h" diff --git a/ui/message.c b/ui/message.c index 8769f9b2..b3015d17 100644 --- a/ui/message.c +++ b/ui/message.c @@ -23,6 +23,8 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "gr.h" #include "ui.h" #include "key.h" +#include "vid.h" + // ts = total span // w = width of each item diff --git a/ui/number.c b/ui/number.c index 25ec47d5..3185cb12 100644 --- a/ui/number.c +++ b/ui/number.c @@ -22,6 +22,8 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "pstypes.h" #include "gr.h" #include "ui.h" +#include "vid.h" + #define TEXT_EXTRA_HEIGHT 5 diff --git a/ui/popup.c b/ui/popup.c index 8cc26a30..a020d7ae 100644 --- a/ui/popup.c +++ b/ui/popup.c @@ -20,6 +20,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "gr.h" #include "ui.h" #include "mouse.h" +#include "vid.h" #define MENU_BORDER 2 -- 2.39.2