Update to ZDoom r1229:

- Separated low level sound code from all high level dependencies.
- Separated low level sound channel class from high level class which now
  is just a subclass of the low level class.
- Moved some more high level sound logic out of FMODSoundRenderer:
  The rolloff and channel ended callbacks now call functions in s_sound.cpp
  instead of working on the data itself and GSnd->StopSound has been replaced
  with S_StopChannel.
- Changed compilation for g_doom, g_heretic, g_hexen and g_strife folders so 
  that all files are included by a central one instead of compiling each one 
  separately. This speeds up the compilation process by 25% when doing a 
  complete rebuild in Visual C.
- Cleaned up some include dependencies.


git-svn-id: http://mancubus.net/svn/hosted/gzdoom/trunk@179 b0f79afe-0144-0410-b225-9a4edf0717df

src/CMakeLists.txt

@@ -555,100 +555,15 @@ add_executable( zdoom WIN32
 	x86.cpp
 	zstrformat.cpp
 	zstring.cpp
-	fragglescript/t_cmd.cpp
-	fragglescript/t_fspic.cpp
-	fragglescript/t_func.cpp
-	fragglescript/t_load.cpp
-	fragglescript/t_oper.cpp
-	fragglescript/t_parse.cpp
-	fragglescript/t_prepro.cpp
-	fragglescript/t_script.cpp
-	fragglescript/t_spec.cpp
-	fragglescript/t_variable.cpp
-	g_doom/a_arachnotron.cpp
-	g_doom/a_archvile.cpp
-	g_doom/a_bossbrain.cpp
-	g_doom/a_bruiser.cpp
-	g_doom/a_cacodemon.cpp
-	g_doom/a_cyberdemon.cpp
-	g_doom/a_demon.cpp
-	g_doom/a_doomimp.cpp
 	g_doom/a_doommisc.cpp
-	g_doom/a_doomweaps.cpp
-	g_doom/a_fatso.cpp
-	g_doom/a_keen.cpp
-	g_doom/a_lostsoul.cpp
-	g_doom/a_painelemental.cpp
-	g_doom/a_possessed.cpp
-	g_doom/a_revenant.cpp
-	g_doom/a_scriptedmarine.cpp
-	g_doom/a_spidermaster.cpp
 	g_doom/doom_sbar.cpp
-	g_heretic/a_chicken.cpp
-	g_heretic/a_dsparil.cpp
-	g_heretic/a_hereticartifacts.cpp
-	g_heretic/a_hereticimp.cpp
 	g_heretic/a_hereticmisc.cpp
-	g_heretic/a_hereticweaps.cpp
-	g_heretic/a_ironlich.cpp
-	g_heretic/a_knight.cpp
-	g_heretic/a_wizard.cpp
 	g_heretic/heretic_sbar.cpp
-	g_hexen/a_bats.cpp
-	g_hexen/a_bishop.cpp
-	g_hexen/a_blastradius.cpp
-	g_hexen/a_boostarmor.cpp
-	g_hexen/a_centaur.cpp
-	g_hexen/a_clericflame.cpp
-	g_hexen/a_clericholy.cpp
-	g_hexen/a_clericmace.cpp
-	g_hexen/a_clericstaff.cpp
-	g_hexen/a_dragon.cpp
-	g_hexen/a_fighteraxe.cpp
-	g_hexen/a_fighterhammer.cpp
-	g_hexen/a_fighterplayer.cpp
-	g_hexen/a_fighterquietus.cpp
-	g_hexen/a_firedemon.cpp
-	g_hexen/a_flechette.cpp
-	g_hexen/a_fog.cpp
-	g_hexen/a_healingradius.cpp
-	g_hexen/a_heresiarch.cpp
-	g_hexen/a_hexenspecialdecs.cpp
-	g_hexen/a_iceguy.cpp
-	g_hexen/a_korax.cpp
-	g_hexen/a_magecone.cpp
-	g_hexen/a_magelightning.cpp
-	g_hexen/a_magestaff.cpp
-	g_hexen/a_magewand.cpp
-	g_hexen/a_pig.cpp
-	g_hexen/a_serpent.cpp
-	g_hexen/a_spike.cpp
-	g_hexen/a_summon.cpp
-	g_hexen/a_teleportother.cpp
-	g_hexen/a_wraith.cpp
+	g_hexen/a_hexenmisc.cpp
 	g_hexen/hexen_sbar.cpp
 	g_raven/a_artitele.cpp
 	g_raven/a_minotaur.cpp
-	g_strife/a_acolyte.cpp
-	g_strife/a_alienspectres.cpp
-	g_strife/a_coin.cpp
-	g_strife/a_crusader.cpp
-	g_strife/a_entityboss.cpp
-	g_strife/a_inquisitor.cpp
-	g_strife/a_loremaster.cpp
-	g_strife/a_macil.cpp
-	g_strife/a_oracle.cpp
-	g_strife/a_programmer.cpp
-	g_strife/a_reaver.cpp
-	g_strife/a_rebels.cpp
-	g_strife/a_sentinel.cpp
-	g_strife/a_spectral.cpp
-	g_strife/a_stalker.cpp
-	g_strife/a_strifeitems.cpp
 	g_strife/a_strifestuff.cpp
-	g_strife/a_strifeweapons.cpp
-	g_strife/a_templar.cpp
-	g_strife/a_thingstoblowup.cpp
 	g_strife/strife_sbar.cpp
 	g_shared/a_action.cpp
 	g_shared/a_armor.cpp

src/actor.h

@@ -25,14 +25,10 @@
 
 // Basics.
 #include "tables.h"
-#include "m_fixed.h"
 
 // We need the thinker_t stuff.
 #include "dthinker.h"
 
-// We need the WAD data structure for Map things,
-// from the THINGS lump.
-#include "doomdata.h"
 
 // States are tied to finite states are
 //	tied to animation frames.

src/am_map.cpp

@@ -34,13 +34,17 @@
 #include "a_sharedglobal.h"
 #include "statnums.h"
 #include "r_translate.h"
+#include "d_event.h"
 
 #include "m_cheat.h"
 #include "i_system.h"
 #include "c_dispatch.h"
+#include "colormatcher.h"
+#include "d_netinf.h"
 
 // Needs access to LFB.
 #include "v_video.h"
+#include "v_palette.h"
 
 #include "v_text.h"
 

src/am_map.h

@@ -22,7 +22,8 @@
 #ifndef __AMMAP_H__
 #define __AMMAP_H__
 
-#include "d_event.h"
+struct event_t;
+class FArchive;
 
 // Called by main loop.
 bool AM_Responder (event_t* ev);

src/b_bot.cpp

@@ -11,6 +11,7 @@
 #include "p_local.h"
 #include "cmdlib.h"
 #include "teaminfo.h"
+#include "d_net.h"
 
 CVAR (Int, bot_next_color, 11, 0)
 CVAR (Bool, bot_observer, false, 0)

src/b_bot.h

@@ -8,7 +8,6 @@
 #define __B_BOT_H__
 
 #include "c_cvars.h"
-#include "m_argv.h"
 #include "tables.h"
 #include "info.h"
 #include "doomdef.h"

src/b_func.cpp

@@ -20,7 +20,7 @@
 #include "stats.h"
 #include "i_system.h"
 #include "s_sound.h"
-#include "a_doomglobal.h"
+#include "d_event.h"
 
 static FRandom pr_botdofire ("BotDoFire");
 

src/b_game.cpp

@@ -58,6 +58,8 @@ Everything that is changed is marked (maybe commented) with "Added by MC"
 #include "p_acs.h"
 #include "teaminfo.h"
 #include "i_system.h"
+#include "d_net.h"
+#include "d_netinf.h"
 
 static FRandom pr_botspawn ("BotSpawn");
 

src/b_move.cpp

@@ -17,6 +17,7 @@
 #include "p_lnspec.h"
 #include "gi.h"
 #include "a_keys.h"
+#include "d_event.h"
 
 enum dirtype_t
 {

src/b_think.cpp

@@ -18,6 +18,8 @@
 #include "stats.h"
 #include "a_pickups.h"
 #include "statnums.h"
+#include "d_net.h"
+#include "d_event.h"
 
 static FRandom pr_botmove ("BotMove");
 

src/bbannouncer.cpp

@@ -47,6 +47,8 @@
 #include "s_sound.h"
 #include "m_random.h"
 #include "d_player.h"
+#include "g_level.h"
+#include "doomstat.h"
 
 // MACROS ------------------------------------------------------------------
 

src/c_bind.cpp

@@ -42,6 +42,7 @@
 #include "gi.h"
 #include "configfile.h"
 #include "i_system.h"
+#include "d_event.h"
 
 #include <math.h>
 #include <stdlib.h>

src/c_bind.h

@@ -34,10 +34,8 @@
 #ifndef __C_BINDINGS_H__
 #define __C_BINDINGS_H__
 
-#include "doomtype.h"
-#include "d_event.h"
-#include <stdio.h>
 
+struct event_t;
 class FConfigFile;
 
 bool C_DoKey (event_t *ev);

src/c_cmds.cpp

@@ -66,6 +66,8 @@
 #include "p_local.h"
 #include "r_sky.h"
 #include "p_setup.h"
+#include "cmdlib.h"
+#include "d_net.h"
 
 extern FILE *Logfile;
 extern bool insave;

src/c_console.cpp

@@ -32,7 +32,6 @@
 **
 */
 
-#include "m_alloc.h"
 #include "templates.h"
 #include "p_setup.h"
 #include <stdarg.h>
@@ -62,6 +61,10 @@
 #include "doomstat.h"
 #include "d_gui.h"
 #include "v_video.h"
+#include "cmdlib.h"
+#include "d_net.h"
+#include "g_level.h"
+#include "d_event.h"
 
 #include "gi.h"
 

src/c_console.h

@@ -34,19 +34,19 @@
 #ifndef __C_CONSOLE__
 #define __C_CONSOLE__
 
-#include <stdio.h>
 #include <stdarg.h>
+#include "basictypes.h"
 
-#include "doomtype.h"
-#include "doomdef.h"
-#include "d_event.h"
-#include "cmdlib.h"
+struct event_t;
 
 #define C_BLINKRATE			(TICRATE/2)
 
-typedef enum cstate_t {
+typedef enum cstate_t 
+{
 	c_up=0, c_down=1, c_falling=2, c_rising=3
-} constate_e;
+} 
+constate_e;
+
 extern constate_e ConsoleState;
 extern int ConBottom;
 

src/c_cvars.cpp

@@ -40,7 +40,6 @@
 #include "configfile.h"
 #include "c_console.h"
 #include "c_dispatch.h"
-#include "m_alloc.h"
 
 #include "doomstat.h"
 #include "c_cvars.h"
@@ -51,6 +50,7 @@
 #include "i_system.h"
 #include "v_palette.h"
 #include "v_video.h"
+#include "colormatcher.h"
 
 struct FLatchedValue
 {

src/c_dispatch.cpp

@@ -47,11 +47,11 @@
 #include "c_dispatch.h"
 #include "m_argv.h"
 #include "doomstat.h"
-#include "m_alloc.h"
 #include "d_player.h"
 #include "configfile.h"
 #include "m_crc32.h"
 #include "v_text.h"
+#include "d_net.h"
 
 // MACROS ------------------------------------------------------------------
 

src/c_dispatch.h

@@ -34,7 +34,7 @@
 #ifndef __C_DISPATCH_H__
 #define __C_DISPATCH_H__
 
-#include "dobject.h"
+#include "doomtype.h"
 
 class FConfigFile;
 class APlayerPawn;

src/cmdlib.cpp

@@ -10,8 +10,6 @@
 #include <sys/stat.h>
 #include <time.h>
 
-#include "m_alloc.h"
-
 /*
 progdir will hold the path up to the game directory, including the slash
 

src/cmdlib.h

@@ -13,7 +13,6 @@
 #endif
 
 #include "doomtype.h"
-#include "zstring.h"
 
 #include <stdio.h>
 #include <string.h>

src/colormatcher.h

@@ -49,4 +49,7 @@ private:
 	const PalEntry *Pal;
 };
 
+extern FColorMatcher ColorMatcher;
+
+
 #endif //__COLORMATCHER_H__

src/ct_chat.cpp

@@ -22,12 +22,15 @@
 #include "c_console.h"
 #include "c_dispatch.h"
 #include "c_cvars.h"
+#include "d_player.h"
 #include "v_text.h"
 #include "v_video.h"
 #include "gi.h"
 #include "d_gui.h"
 #include "i_input.h"
 #include "templates.h"
+#include "d_net.h"
+#include "d_event.h"
 
 #define QUEUESIZE		128
 #define MESSAGESIZE		128
@@ -170,7 +173,7 @@ bool CT_Responder (event_t *ev)
 			}
 			else
 			{
-				CT_AddChar (ev->data1);
+				CT_AddChar (char(ev->data1));
 			}
 			return true;
 		}

src/d_dehacked.cpp

@@ -52,7 +52,6 @@
 #include "g_level.h"
 #include "cmdlib.h"
 #include "gstrings.h"
-#include "m_alloc.h"
 #include "m_misc.h"
 #include "w_wad.h"
 #include "d_player.h"
@@ -64,7 +63,6 @@
 #include "v_palette.h"
 #include "a_sharedglobal.h"
 #include "thingdef/thingdef.h"
-#include "dobject.h"
 #include "r_translate.h"
 
 // [SO] Just the way Randy said to do it :)

src/d_event.h

@@ -24,7 +24,7 @@
 #define __D_EVENT_H__
 
 
-#include "doomtype.h"
+#include "basictypes.h"
 
 
 //

src/d_main.cpp

@@ -49,7 +49,6 @@
 #include "doomerrors.h"
 
 #include "d_gui.h"
-#include "m_alloc.h"
 #include "m_random.h"
 #include "doomdef.h"
 #include "doomstat.h"
@@ -84,7 +83,6 @@
 #include "gi.h"
 #include "b_bot.h"		//Added by MC:
 #include "stats.h"
-#include "a_doomglobal.h"
 #include "gameconfigfile.h"
 #include "sbar.h"
 #include "decallib.h"
@@ -96,6 +94,11 @@
 #include "teaminfo.h"
 #include "hardware.h"
 #include "sbarinfo.h"
+#include "d_net.h"
+#include "g_level.h"
+#include "d_event.h"
+#include "d_netinf.h"
+#include "v_palette.h"
 
 EXTERN_CVAR(Bool, hud_althud)
 void DrawHUD();

src/d_main.h

@@ -25,7 +25,9 @@
 #ifndef __D_MAIN__
 #define __D_MAIN__
 
-#include "d_event.h"
+#include "doomtype.h"
+
+struct event_t;
 
 //
 // D_DoomMain()

src/d_net.cpp

@@ -25,7 +25,6 @@
 #include <stddef.h>
 
 #include "version.h"
-#include "m_alloc.h"
 #include "m_menu.h"
 #include "m_random.h"
 #include "i_system.h"
@@ -36,6 +35,7 @@
 #include "doomstat.h"
 #include "c_console.h"
 #include "d_netinf.h"
+#include "d_net.h"
 #include "cmdlib.h"
 #include "s_sound.h"
 #include "m_cheat.h"
@@ -54,6 +54,9 @@
 #include "st_start.h"
 #include "teaminfo.h"
 #include "p_conversation.h"
+#include "g_level.h"
+#include "d_event.h"
+#include "m_argv.h"
 
 int P_StartScript (AActor *who, line_t *where, int script, char *map, bool backSide,
 					int arg0, int arg1, int arg2, int always, bool wantResultCode, bool net);

src/d_net.h

@@ -24,6 +24,8 @@
 #define __D_NET__
 
 #include "doomtype.h"
+#include "doomdef.h"
+#include "d_ticcmd.h"
 
 
 //
@@ -127,4 +129,19 @@ void Net_SkipCommand (int type, BYTE **stream);
 
 void Net_ClearBuffers ();
 
+
+// Netgame stuff (buffers and pointers, i.e. indices).
+
+// This is the interface to the packet driver, a separate program
+// in DOS, but just an abstraction here.
+extern	doomcom_t		doomcom;
+
+extern	struct ticcmd_t	localcmds[LOCALCMDTICS];
+
+extern	int 			maketic;
+extern	int 			nettics[MAXNETNODES];
+
+extern	ticcmd_t		netcmds[MAXPLAYERS][BACKUPTICS];
+extern	int 			ticdup;
+
 #endif

src/d_netinf.h

@@ -38,36 +38,11 @@
 
 EXTERN_CVAR (Float, autoaim)
 
-#define MAXPLAYERNAME	15
-
-enum
-{
-	GENDER_MALE,
-	GENDER_FEMALE,
-	GENDER_NEUTER
-};
-
 int D_GenderToInt (const char *gender);
 extern const char *GenderNames[3];
 
 int D_PlayerClassToInt (const char *classname);
 
-struct userinfo_s
-{
-	char		netname[MAXPLAYERNAME+1];
-	BYTE		team;
-	int			aimdist;
-	int			color;
-	int			skin;
-	int			gender;
-	bool		neverswitch;
-	fixed_t		MoveBob, StillBob;
-	int			PlayerClass;
-};
-typedef struct userinfo_s userinfo_t;
-
-FArchive &operator<< (FArchive &arc, userinfo_t &info);
-
 void D_SetupUserInfo (void);
 
 void D_UserInfoChanged (FBaseCVar *info);

src/d_player.h

@@ -182,6 +182,32 @@ typedef enum
 
 #define WP_NOCHANGE ((AWeapon*)~0)
 
+
+#define MAXPLAYERNAME	15
+
+enum
+{
+	GENDER_MALE,
+	GENDER_FEMALE,
+	GENDER_NEUTER
+};
+
+struct userinfo_t
+{
+	char		netname[MAXPLAYERNAME+1];
+	BYTE		team;
+	int			aimdist;
+	int			color;
+	int			skin;
+	int			gender;
+	bool		neverswitch;
+	fixed_t		MoveBob, StillBob;
+	int			PlayerClass;
+};
+
+FArchive &operator<< (FArchive &arc, userinfo_t &info);
+
+
 //
 // Extended player object info: player_t
 //

src/d_protocol.cpp

@@ -32,14 +32,13 @@
 **
 */
 
-#include "m_alloc.h"
 #include "i_system.h"
-#include "d_protocol.h"
 #include "d_ticcmd.h"
 #include "d_net.h"
 #include "doomdef.h"
 #include "doomstat.h"
 #include "cmdlib.h"
+#include "farchive.h"
 
 
 char *ReadString (BYTE **stream)
@@ -281,6 +280,11 @@ int PackUserCmd (const usercmd_t *ucmd, const usercmd_t *basis, BYTE **stream)
 	return *stream - start;
 }
 
+FArchive &operator<< (FArchive &arc, ticcmd_t &cmd)
+{
+	return arc << cmd.consistancy << cmd.ucmd;
+}
+
 FArchive &operator<< (FArchive &arc, usercmd_t &cmd)
 {
 	BYTE bytes[256];

src/d_protocol.h

@@ -34,11 +34,7 @@
 #ifndef __D_PROTOCOL_H__
 #define __D_PROTOCOL_H__
 
-#include "doomstat.h"
 #include "doomtype.h"
-#include "doomdef.h"
-#include "m_fixed.h"
-#include "farchive.h"
 
 // The IFF routines here all work with big-endian IDs, even if the host
 // system is little-endian.
@@ -79,6 +75,8 @@ struct usercmd_s
 };
 typedef struct usercmd_s usercmd_t;
 
+class FArchive;
+
 FArchive &operator<< (FArchive &arc, usercmd_t &cmd);
 
 // When transmitted, the above message is preceded by a byte

src/d_ticcmd.h

@@ -23,7 +23,6 @@
 #ifndef __D_TICCMD_H__
 #define __D_TICCMD_H__
 
-#include "doomtype.h"
 #include "d_protocol.h"
 
 // The data sampled per tick (single player)
@@ -37,9 +36,6 @@ struct ticcmd_t
 };
 
 
-inline FArchive &operator<< (FArchive &arc, ticcmd_t &cmd)
-{
-	return arc << cmd.consistancy << cmd.ucmd;
-}
+FArchive &operator<< (FArchive &arc, ticcmd_t &cmd);
 
 #endif	// __D_TICCMD_H__

src/decallib.cpp

@@ -46,6 +46,8 @@
 #include "a_sharedglobal.h"
 #include "r_translate.h"
 #include "gi.h"
+#include "g_level.h"
+#include "colormatcher.h"
 
 FDecalLib DecalLibrary;
 

src/decallib.h

@@ -37,9 +37,8 @@
 #include <string.h>
 
 #include "doomtype.h"
-#include "tarray.h"
-#include "name.h"
-#include "actor.h"
+#include "r_blend.h"
+#include "textures/textures.h"
 
 class FScanner;
 class FDecalTemplate;

src/dobject.cpp

@@ -38,7 +38,6 @@
 #include "cmdlib.h"
 #include "actor.h"
 #include "dobject.h"
-#include "m_alloc.h"
 #include "doomstat.h"		// Ideally, DObjects can be used independant of Doom.
 #include "d_player.h"		// See p_user.cpp to find out why this doesn't work.
 #include "g_game.h"			// Needed for bodyque.
@@ -49,8 +48,6 @@
 #include "a_sharedglobal.h"
 #include "dsectoreffect.h"
 
-#include "autosegs.h"
-
 PClass DObject::_StaticType;
 ClassReg DObject::RegistrationInfo =
 {

src/dobject.h

@@ -35,9 +35,7 @@
 #define __DOBJECT_H__
 
 #include <stdlib.h>
-#include "tarray.h"
 #include "doomtype.h"
-#include "m_alloc.h"
 #ifndef _MSC_VER
 #include "autosegs.h"
 #endif

src/dobjgc.cpp

@@ -69,6 +69,8 @@
 #include "p_acs.h"
 #include "s_sndseq.h"
 #include "r_interpolate.h"
+#include "doomstat.h"
+#include "m_argv.h"
 
 // MACROS ------------------------------------------------------------------
 

src/dobjtype.cpp

@@ -35,8 +35,8 @@
 #include "dobject.h"
 #include "i_system.h"
 #include "actor.h"
-#include "autosegs.h"
 #include "templates.h"
+#include "autosegs.h"
 
 TArray<PClass *> PClass::m_RuntimeActors;
 TArray<PClass *> PClass::m_Types;

src/doomdata.h

@@ -29,9 +29,6 @@
 
 // Some global defines, that configure the game.
 #include "doomdef.h"
-#include "m_swap.h"
-
-
 
 //
 // Map level types.
@@ -350,5 +347,11 @@ enum EMapThingFlags
 	STF_ALTSHADOW		= 0x0200,
 };
 
+// Player spawn spots for deathmatch.
+extern TArray<FMapThing> deathmatchstarts;
+
+// Player spawn spots.
+extern	FMapThing		playerstarts[MAXPLAYERS];
+
 
 #endif					// __DOOMDATA__

src/doomdef.h

@@ -88,6 +88,12 @@ typedef enum
 	GS_FORCEWIPEFADE = -2
 } gamestate_t;
 
+extern	gamestate_t 	gamestate;
+
+// wipegamestate can be set to -1
+//	to force a wipe on the next draw
+extern gamestate_t wipegamestate;
+
 
 typedef float skill_t;
 

src/doomstat.cpp

@@ -29,7 +29,6 @@
 #include "i_system.h"
 #include "g_level.h"
 #include "p_local.h"
-#include "p_acs.h"
 
 int SaveVersion;
 
@@ -40,8 +39,8 @@ FStringTable	GStrings;
 EGameSpeed		GameSpeed = SPEED_Normal;
 
 // Game Mode - identify IWAD as shareware, retail etc.
-GameMode_t		gamemode = undetermined;
-GameMission_t	gamemission = doom;
+int	gamemode = undetermined;
+int	gamemission = doom;
 
 // Show developer messages if true.
 CVAR (Bool, developer, false, 0)

src/doomstat.h

@@ -28,16 +28,6 @@
 #ifndef __D_STATE__
 #define __D_STATE__
 
-// We need globally shared data structures,
-//	for defining the global state variables.
-// We need the player data structure as well.
-//#include "d_player.h"
-
-#include "doomdata.h"
-#include "d_net.h"
-#include "g_level.h"
-
-// We also need the definition of a cvar
 #include "c_cvars.h"
 
 // -----------------------
@@ -61,8 +51,8 @@ extern	bool			devparm;		// DEBUG: launched with -devparm
 // -----------------------------------------------------
 // Game Mode - identify IWAD as shareware, retail etc.
 //
-extern GameMode_t		gamemode;
-extern GameMission_t	gamemission;
+extern int	gamemode;
+extern int	gamemission;
 
 // -------------------------------------------
 // Selected skill type, map etc.
@@ -96,7 +86,7 @@ EXTERN_CVAR (Float, teamdamage)
 
 // [RH] The class the player will spawn as in single player,
 // in case using a random class with Hexen.
-extern int SinglePlayerClass[MAXPLAYERS];
+extern int SinglePlayerClass[/*MAXPLAYERS*/];
 
 // -------------------------
 // Internal parameters for sound rendering.
@@ -158,11 +148,6 @@ extern	int				demover;
 // Quit after playing a demo from cmdline.
 extern	bool			singledemo; 	
 
-
-
-
-extern	gamestate_t 	gamestate;
-
 extern	int				SaveVersion;
 
 
@@ -180,23 +165,7 @@ extern	int 			gametic;
 
 
 // Alive? Disconnected?
-extern	bool	 		playeringame[MAXPLAYERS];
-
-
-// Player spawn spots for deathmatch.
-extern TArray<FMapThing> deathmatchstarts;
-
-// Player spawn spots.
-extern	FMapThing		playerstarts[MAXPLAYERS];
-
-// Intermission stats.
-// Parameters for world map / intermission.
-extern	struct wbstartstruct_s wminfo; 
-
-
-
-
-
+extern	bool	 		playeringame[/*MAXPLAYERS*/];
 
 
 //-----------------------------------------
@@ -214,9 +183,6 @@ extern	bool	 		precache;
 //REFRESH
 //-------
 
-// wipegamestate can be set to -1
-//	to force a wipe on the next draw
-extern gamestate_t wipegamestate;
 extern bool setsizeneeded;
 extern bool setmodeneeded;
 
@@ -239,21 +205,6 @@ extern	int 			bodyqueslot;
 
 
 
-// Netgame stuff (buffers and pointers, i.e. indices).
-
-// This is the interface to the packet driver, a separate program
-// in DOS, but just an abstraction here.
-extern	doomcom_t		doomcom;
-
-extern	struct ticcmd_t	localcmds[LOCALCMDTICS];
-
-extern	int 			maketic;
-extern	int 			nettics[MAXNETNODES];
-
-extern	ticcmd_t		netcmds[MAXPLAYERS][BACKUPTICS];
-extern	int 			ticdup;
-
-
 // ---- [RH] ----
 EXTERN_CVAR (Bool, developer)
 

src/doomtype.h

@@ -37,8 +37,9 @@
 #endif
 
 #include <limits.h>
-#include "zstring.h"
+#include "tarray.h"
 #include "name.h"
+#include "zstring.h"
 #include "vectors.h"
 
 // Since this file is included by everything, it seems an appropriate place
@@ -111,72 +112,7 @@
 #define NOVTABLE
 #endif
 
-#ifdef _MSC_VER
-typedef __int8					SBYTE;
-typedef unsigned __int8			BYTE;
-typedef __int16					SWORD;
-typedef unsigned __int16		WORD;
-typedef __int32					SDWORD;
-typedef unsigned __int32		uint32;
-typedef __int64					SQWORD;
-typedef unsigned __int64		QWORD;
-#else
-#include <stdint.h>
-
-typedef int8_t					SBYTE;
-typedef uint8_t					BYTE;
-typedef int16_t					SWORD;
-typedef uint16_t				WORD;
-typedef int32_t					SDWORD;
-typedef uint32_t				uint32;
-typedef int64_t					SQWORD;
-typedef uint64_t				QWORD;
-#endif
-
-// windef.h, included by windows.h, has its own incompatible definition
-// of DWORD as a long. In files that mix Doom and Windows code, you
-// must define USE_WINDOWS_DWORD before including doomtype.h so that
-// you are aware that those files have a different DWORD than the rest
-// of the source.
-
-#ifndef USE_WINDOWS_DWORD
-typedef uint32					DWORD;
-#endif
-typedef uint32					BITFIELD;
-typedef int						INTBOOL;
-
-// a 64-bit constant
-#ifdef __GNUC__
-#define CONST64(v) (v##LL)
-#define UCONST64(v) (v##ULL)
-#else
-#define CONST64(v) ((SQWORD)(v))
-#define UCONST64(v) ((QWORD)(v))
-#endif
-
-#if !defined(GUID_DEFINED)
-#define GUID_DEFINED
-typedef struct _GUID
-{
-    DWORD	Data1;
-    WORD	Data2;
-    WORD	Data3;
-    BYTE	Data4[8];
-} GUID;
-#endif
-
-union QWORD_UNION
-{
-	QWORD AsOne;
-	struct
-	{
-#ifdef WORDS_BIG_ENDIAN
-		unsigned int Hi, Lo;
-#else
-		unsigned int Lo, Hi;
-#endif
-	};
-};
+#include "basictypes.h"
 
 // Bounding box coordinate storage.
 enum
@@ -188,33 +124,6 @@ enum
 };		// bbox coordinates
 
 
-//
-// Fixed point, 32bit as 16.16.
-//
-#define FRACBITS						16
-#define FRACUNIT						(1<<FRACBITS)
-
-typedef SDWORD							fixed_t;
-typedef DWORD							dsfixed_t;				// fixedpt used by span drawer
-
-#define FIXED_MAX						(signed)(0x7fffffff)
-#define FIXED_MIN						(signed)(0x80000000)
-
-#define DWORD_MIN						((uint32)0)
-#define DWORD_MAX						((uint32)0xffffffff)
-
-
-#ifdef __GNUC__
-#define GCCPRINTF(stri,firstargi)		__attribute__((format(printf,stri,firstargi)))
-#define GCCFORMAT(stri)					__attribute__((format(printf,stri,0)))
-#define GCCNOWARN						__attribute__((unused))
-#else
-#define GCCPRINTF(a,b)
-#define GCCFORMAT(a)
-#define GCCNOWARN
-#endif
-
-
 // [RH] This gets used all over; define it here:
 int STACK_ARGS Printf (int printlevel, const char *, ...) GCCPRINTF(2,3);
 int STACK_ARGS Printf (const char *, ...) GCCPRINTF(1,2);

src/dsectoreffect.h

@@ -1,7 +1,6 @@
 #ifndef __DSECTOREFFECT_H__
 #define __DSECTOREFFECT_H__
 
-#include "dobject.h"
 #include "dthinker.h"
 #include "r_defs.h"
 

src/f_finale.cpp

@@ -46,6 +46,9 @@
 #include "templates.h"
 #include "c_bind.h"
 #include "r_translate.h"
+#include "g_level.h"
+#include "d_event.h"
+#include "v_palette.h"
 
 static void FadePic ();
 static void GetFinaleText (const char *msgLumpName);

src/f_finale.h

@@ -23,8 +23,11 @@
 #ifndef __F_FINALE__
 #define __F_FINALE__
 
-#include "doomtype.h"
-#include "d_event.h"
+#include "basictypes.h"
+
+struct event_t;
+
+
 //
 // FINALE
 //

src/f_wipe.cpp

@@ -24,7 +24,6 @@
 #include "i_video.h"
 #include "v_video.h"
 #include "m_random.h"
-#include "m_alloc.h"
 #include "doomdef.h"
 #include "f_wipe.h"
 #include "c_cvars.h"

src/farchive.cpp

@@ -47,7 +47,6 @@
 
 #include "doomtype.h"
 #include "farchive.h"
-#include "m_alloc.h"
 #include "m_swap.h"
 #include "m_crc32.h"
 #include "cmdlib.h"

src/farchive.h

@@ -35,10 +35,7 @@
 #define __FARCHIVE_H__
 
 #include <stdio.h>
-#include "doomtype.h"
 #include "dobject.h"
-#include "tarray.h"
-#include "name.h"
 
 class FFile
 {
@@ -278,8 +275,6 @@ inline FArchive &operator<< (FArchive &arc, PalEntry &p)
 	return arc << p.a << p.r << p.g << p.b;
 }
 
-#include "dobject.h"
-
 template<class T>
 inline FArchive &operator<< (FArchive &arc, T* &object)
 {
@@ -288,6 +283,14 @@ inline FArchive &operator<< (FArchive &arc, T* &object)
 
 FArchive &operator<< (FArchive &arc, const PClass * &info);
 
+class FFont;
+FArchive &SerializeFFontPtr (FArchive &arc, FFont* &font);
+template<> inline FArchive &operator<< <FFont> (FArchive &arc, FFont* &font)
+{
+	return SerializeFFontPtr (arc, font);
+}
+
+
 template<class T,class TT>
 inline FArchive &operator<< (FArchive &arc, TArray<T,TT> &self)
 {

src/fragglescript/t_cmd.cpp

@@ -45,6 +45,7 @@
 #include "doomstat.h"
 #include "c_dispatch.h"
 #include "sc_man.h"
+#include "g_level.h"
 #include "gl/gl_functions.h"
 
 //==========================================================================

src/fragglescript/t_func.cpp

@@ -61,6 +61,9 @@
 #include "gi.h"
 #include "zstring.h"
 #include "i_system.h"
+#include "doomstat.h"
+#include "g_level.h"
+#include "v_palette.h"
 
 #include "gl/gl_data.h"
 

src/fragglescript/t_prepro.cpp

@@ -56,6 +56,7 @@
 #include "t_script.h"
 #include "i_system.h"
 #include "w_wad.h"
+#include "farchive.h"
 
 
 //==========================================================================

src/fragglescript/t_script.cpp

@@ -55,7 +55,7 @@
 #include "c_dispatch.h"
 #include "i_system.h"
 #include "doomerrors.h"
-
+#include "doomstat.h"
 
 //==========================================================================
 //

src/fragglescript/t_variable.cpp

@@ -54,6 +54,7 @@
 
 #include "t_script.h"
 #include "a_pickups.h"
+#include "farchive.h"
 
 
 //==========================================================================

src/g_doom/a_arachnotron.cpp

@@ -1,10 +1,11 @@
+/*
 #include "actor.h"
 #include "s_sound.h"
 #include "p_local.h"
 #include "p_enemy.h"
-#include "a_doomglobal.h"
 #include "a_action.h"
 #include "thingdef/thingdef.h"
+*/
 
 DEFINE_ACTION_FUNCTION(AActor, A_BspiAttack)
 {		

src/g_doom/a_archvile.cpp

@@ -1,12 +1,13 @@
+/*
 #include "actor.h"
 #include "info.h"
 #include "p_local.h"
 #include "s_sound.h"
 #include "p_enemy.h"
-#include "a_doomglobal.h"
 #include "gstrings.h"
 #include "a_action.h"
 #include "thingdef/thingdef.h"
+*/
 
 //
 // PIT_VileCheck

src/g_doom/a_bossbrain.cpp

@@ -1,13 +1,16 @@
+/*
 #include "actor.h"
 #include "info.h"
 #include "m_random.h"
 #include "p_local.h"
 #include "p_enemy.h"
 #include "s_sound.h"
-#include "a_doomglobal.h"
 #include "statnums.h"
 #include "a_specialspot.h"
 #include "thingdef/thingdef.h"
+#include "doomstat.h"
+#include "g_level.h"
+*/
 
 static FRandom pr_brainscream ("BrainScream");
 static FRandom pr_brainexplode ("BrainExplode");

src/g_doom/a_bruiser.cpp

@@ -1,14 +1,3 @@
-#include "actor.h"
-#include "info.h"
-#include "m_random.h"
-#include "s_sound.h"
-#include "p_local.h"
-#include "p_enemy.h"
-#include "doomstat.h"
-#include "gstrings.h"
-#include "a_action.h"
-#include "thingdef/thingdef.h"
-
 static FRandom pr_bruisattack ("BruisAttack");
 
 

src/g_doom/a_cacodemon.cpp

@@ -1,3 +1,4 @@
+/*
 #include "actor.h"
 #include "info.h"
 #include "m_random.h"
@@ -7,6 +8,7 @@
 #include "a_action.h"
 #include "s_sound.h"
 #include "thingdef/thingdef.h"
+*/
 
 static FRandom pr_headattack ("HeadAttack");
 

src/g_doom/a_cyberdemon.cpp

@@ -1,10 +1,11 @@
+/*
 #include "actor.h"
 #include "p_local.h"
 #include "s_sound.h"
 #include "p_enemy.h"
-#include "a_doomglobal.h"
 #include "a_action.h"
 #include "thingdef/thingdef.h"
+*/
 
 DEFINE_ACTION_FUNCTION(AActor, A_CyberAttack)
 {

src/g_doom/a_demon.cpp

@@ -1,3 +1,4 @@
+/*
 #include "actor.h"
 #include "info.h"
 #include "m_random.h"
@@ -6,6 +7,7 @@
 #include "gstrings.h"
 #include "a_action.h"
 #include "thingdef/thingdef.h"
+*/
 
 static FRandom pr_sargattack ("SargAttack");
 

src/g_doom/a_doomglobal.h

@@ -1,9 +1,7 @@
 #ifndef __A_DOOMGLOBAL_H__
 #define __A_DOOMGLOBAL_H__
 
-#include "dobject.h"
 #include "info.h"
-#include "d_player.h"
 
 class AScriptedMarine : public AActor
 {

src/g_doom/a_doomimp.cpp

@@ -1,3 +1,4 @@
+/*
 #include "actor.h"
 #include "info.h"
 #include "m_random.h"
@@ -7,6 +8,7 @@
 #include "gstrings.h"
 #include "a_action.h"
 #include "thingdef/thingdef.h"
+*/
 
 static FRandom pr_troopattack ("TroopAttack");
 

src/g_doom/a_doommisc.cpp

@@ -1,14 +1,37 @@
 #include "actor.h"
 #include "info.h"
-#include "p_enemy.h"
 #include "p_local.h"
-#include "a_doomglobal.h"
 #include "a_sharedglobal.h"
 #include "m_random.h"
 #include "gi.h"
 #include "doomstat.h"
 #include "gstrings.h"
 #include "thingdef/thingdef.h"
+#include "g_level.h"
+#include "p_enemy.h"
+#include "a_doomglobal.h"
+#include "a_specialspot.h"
+#include "templates.h"
+#include "m_bbox.h"
+
+// Include all the other Doom stuff here to reduce compile time
+#include "a_arachnotron.cpp"
+#include "a_archvile.cpp"
+#include "a_bossbrain.cpp"
+#include "a_bruiser.cpp"
+#include "a_cacodemon.cpp"
+#include "a_cyberdemon.cpp"
+#include "a_demon.cpp"
+#include "a_doomimp.cpp"
+#include "a_doomweaps.cpp"
+#include "a_fatso.cpp"
+#include "a_keen.cpp"
+#include "a_lostsoul.cpp"
+#include "a_painelemental.cpp"
+#include "a_possessed.cpp"
+#include "a_revenant.cpp"
+#include "a_spidermaster.cpp"
+#include "a_scriptedmarine.cpp"
 
 // The barrel of green goop ------------------------------------------------
 

src/g_doom/a_doomweaps.cpp

@@ -1,9 +1,9 @@
+/*
 #include "actor.h"
 #include "info.h"
 #include "s_sound.h"
 #include "m_random.h"
 #include "a_pickups.h"
-#include "a_doomglobal.h"
 #include "d_player.h"
 #include "p_pspr.h"
 #include "p_local.h"
@@ -12,6 +12,8 @@
 #include "gi.h"
 #include "templates.h"
 #include "thingdef/thingdef.h"
+#include "doomstat.h"
+*/
 
 static FRandom pr_punch ("Punch");
 static FRandom pr_saw ("Saw");

src/g_doom/a_fatso.cpp

@@ -1,3 +1,4 @@
+/*
 #include "actor.h"
 #include "info.h"
 #include "m_random.h"
@@ -7,6 +8,7 @@
 #include "gstrings.h"
 #include "a_action.h"
 #include "thingdef/thingdef.h"
+*/
 
 //
 // Mancubus attack,

src/g_doom/a_keen.cpp

@@ -1,3 +1,4 @@
+/*
 #include "actor.h"
 #include "info.h"
 #include "p_local.h"
@@ -5,6 +6,7 @@
 #include "p_enemy.h"
 #include "a_action.h"
 #include "thingdef/thingdef.h"
+*/
 
 //
 // A_KeenDie

src/g_doom/a_lostsoul.cpp

@@ -1,3 +1,4 @@
+/*
 #include "templates.h"
 #include "actor.h"
 #include "info.h"
@@ -5,11 +6,11 @@
 #include "s_sound.h"
 #include "p_local.h"
 #include "p_enemy.h"
-#include "a_doomglobal.h"
 #include "gi.h"
 #include "gstrings.h"
 #include "a_action.h"
 #include "thingdef/thingdef.h"
+*/
 
  FRandom pr_lost ("LostMissileRange");
 

src/g_doom/a_painelemental.cpp

@@ -1,12 +1,14 @@
+/*
 #include "actor.h"
 #include "info.h"
 #include "p_enemy.h"
 #include "p_local.h"
-#include "a_doomglobal.h"
 #include "a_action.h"
 #include "templates.h"
 #include "m_bbox.h"
 #include "thingdef/thingdef.h"
+#include "doomstat.h"
+*/
 
 DECLARE_ACTION(A_SkullAttack)
 

src/g_doom/a_possessed.cpp

@@ -1,3 +1,4 @@
+/*
 #include "actor.h"
 #include "info.h"
 #include "m_random.h"
@@ -6,8 +7,8 @@
 #include "p_enemy.h"
 #include "gstrings.h"
 #include "a_action.h"
-#include "a_doomglobal.h"
 #include "thingdef/thingdef.h"
+*/
 
 static FRandom pr_posattack ("PosAttack");
 static FRandom pr_sposattack ("SPosAttack");

src/g_doom/a_revenant.cpp

@@ -1,3 +1,4 @@
+/*
 #include "templates.h"
 #include "actor.h"
 #include "info.h"
@@ -7,8 +8,9 @@
 #include "p_enemy.h"
 #include "gstrings.h"
 #include "a_action.h"
-#include "a_doomglobal.h"
 #include "thingdef/thingdef.h"
+#include "g_level.h"
+*/
 
 static FRandom pr_tracer ("Tracer");
 static FRandom pr_skelfist ("SkelFist");

src/g_doom/a_scriptedmarine.cpp

@@ -1,3 +1,4 @@
+/*
 #include "actor.h"
 #include "p_enemy.h"
 #include "a_action.h"
@@ -8,6 +9,8 @@
 #include "s_sound.h"
 #include "r_translate.h"
 #include "thingdef/thingdef.h"
+#include "g_level.h"
+*/
 
 #define MARINE_PAIN_CHANCE 160
 

src/g_doom/a_spidermaster.cpp

@@ -1,3 +1,4 @@
+/*
 #include "templates.h"
 #include "actor.h"
 #include "m_random.h"
@@ -6,6 +7,7 @@
 #include "p_enemy.h"
 #include "a_action.h"
 #include "thingdef/thingdef.h"
+*/
 
 static FRandom pr_spidrefire ("SpidRefire");
 

src/g_doom/doom_sbar.cpp

@@ -15,6 +15,8 @@
 #include "i_system.h"
 #include "r_translate.h"
 #include "sbarinfo.h"
+#include "g_level.h"
+#include "v_palette.h"
 
 
 #define ST_EVILGRINCOUNT		(2*TICRATE)

src/g_game.cpp

@@ -30,7 +30,6 @@
 
 #include "templates.h"
 #include "version.h"
-#include "m_alloc.h"
 #include "doomdef.h" 
 #include "doomstat.h"
 #include "d_protocol.h"
@@ -42,9 +41,7 @@
 #include "m_random.h"
 #include "m_crc32.h"
 #include "i_system.h"
-#include "p_setup.h"
 #include "p_saveg.h"
-#include "p_effect.h"
 #include "p_tick.h"
 #include "d_main.h"
 #include "wi_stuff.h"
@@ -73,6 +70,9 @@
 #include "a_keys.h"
 #include "a_artifacts.h"
 #include "r_translate.h"
+#include "cmdlib.h"
+#include "d_net.h"
+#include "d_event.h"
 
 #include <zlib.h>
 

src/g_game.h

@@ -23,9 +23,8 @@
 #ifndef __G_GAME__
 #define __G_GAME__
 
-#include "doomdef.h"
-#include "d_event.h"
-
+struct event_t;
+struct PNGHandle;
 
 
 //

src/g_heretic/a_chicken.cpp

@@ -1,3 +1,4 @@
+/*
 #include "actor.h"
 #include "gi.h"
 #include "m_random.h"
@@ -11,6 +12,7 @@
 #include "d_event.h"
 #include "gstrings.h"
 #include "thingdef/thingdef.h"
+*/
 
 void P_UpdateBeak (AActor *actor);
 

src/g_heretic/a_dsparil.cpp

@@ -1,3 +1,4 @@
+/*
 #include "actor.h"
 #include "info.h"
 #include "p_local.h"
@@ -9,6 +10,8 @@
 #include "gstrings.h"
 #include "a_specialspot.h"
 #include "thingdef/thingdef.h"
+#include "g_level.h"
+*/
 
 static FRandom pr_s2fx1 ("S2FX1");
 static FRandom pr_scrc1atk ("Srcr1Attack");

src/g_heretic/a_hereticartifacts.cpp

@@ -1,11 +1,12 @@
+/*
 #include "info.h"
 #include "a_pickups.h"
 #include "a_artifacts.h"
 #include "gstrings.h"
 #include "p_local.h"
-#include "p_enemy.h"
 #include "s_sound.h"
 #include "thingdef/thingdef.h"
+*/
 
 // Tome of power ------------------------------------------------------------
 

src/g_heretic/a_hereticimp.cpp

@@ -1,12 +1,13 @@
+/*
 #include "templates.h"
 #include "actor.h"
 #include "info.h"
 #include "m_random.h"
 #include "s_sound.h"
 #include "p_local.h"
-#include "p_enemy.h"
 #include "gstrings.h"
 #include "thingdef/thingdef.h"
+*/
 
 static FRandom pr_imp ("ImpExplode");
 

src/g_heretic/a_hereticmisc.cpp

@@ -1,7 +1,5 @@
 #include "actor.h"
 #include "info.h"
-#include "p_enemy.h"
-#include "a_doomglobal.h"
 #include "a_pickups.h"
 #include "a_action.h"
 #include "m_random.h"
@@ -9,6 +7,24 @@
 #include "s_sound.h"
 #include "gstrings.h"
 #include "thingdef/thingdef.h"
+#include "p_enemy.h"
+#include "a_specialspot.h"
+#include "g_level.h"
+#include "a_sharedglobal.h"
+#include "templates.h"
+#include "r_translate.h"
+#include "doomstat.h"
+
+// Include all the other Heretic stuff here to reduce compile time
+#include "a_chicken.cpp"
+#include "a_dsparil.cpp"
+#include "a_hereticartifacts.cpp"
+#include "a_hereticimp.cpp"
+#include "a_hereticweaps.cpp"
+#include "a_ironlich.cpp"
+#include "a_knight.cpp"
+#include "a_wizard.cpp"
+
 
 static FRandom pr_podpain ("PodPain");
 static FRandom pr_makepod ("MakePod");
@@ -16,7 +32,7 @@ static FRandom pr_teleg ("TeleGlitter");
 static FRandom pr_teleg2 ("TeleGlitter2");
 static FRandom pr_volcano ("VolcanoSet");
 static FRandom pr_blast ("VolcanoBlast");
-static FRandom pr_impact ("VolcBallImpact");
+static FRandom pr_volcimpact ("VolcBallImpact");
 
 //----------------------------------------------------------------------------
 //
@@ -185,7 +201,7 @@ DEFINE_ACTION_FUNCTION(AActor, A_VolcBallImpact)
 		angle >>= ANGLETOFINESHIFT;
 		tiny->momx = FixedMul (FRACUNIT*7/10, finecosine[angle]);
 		tiny->momy = FixedMul (FRACUNIT*7/10, finesine[angle]);
-		tiny->momz = FRACUNIT + (pr_impact() << 9);
+		tiny->momz = FRACUNIT + (pr_volcimpact() << 9);
 		P_CheckMissileSpawn (tiny);
 	}
 }

src/g_heretic/a_hereticweaps.cpp

@@ -1,3 +1,4 @@
+/*
 #include "templates.h"
 #include "actor.h"
 #include "info.h"
@@ -8,12 +9,11 @@
 #include "p_pspr.h"
 #include "p_local.h"
 #include "gstrings.h"
-#include "p_effect.h"
-#include "gstrings.h"
-#include "p_enemy.h"
 #include "gi.h"
 #include "r_translate.h"
 #include "thingdef/thingdef.h"
+#include "doomstat.h"
+*/
 
 static FRandom pr_sap ("StaffAtkPL1");
 static FRandom pr_sap2 ("StaffAtkPL2");

src/g_heretic/a_ironlich.cpp

@@ -1,3 +1,4 @@
+/*
 #include "actor.h"
 #include "info.h"
 #include "m_random.h"
@@ -7,6 +8,8 @@
 #include "a_action.h"
 #include "gstrings.h"
 #include "thingdef/thingdef.h"
+#include "g_level.h"
+*/
 
 static FRandom pr_foo ("WhirlwindDamage");
 static FRandom pr_atk ("LichAttack");

src/g_heretic/a_knight.cpp

@@ -1,13 +1,14 @@
+/*
 #include "actor.h"
 #include "info.h"
 #include "m_random.h"
 #include "s_sound.h"
 #include "p_local.h"
-#include "p_enemy.h"
 #include "a_action.h"
 #include "a_sharedglobal.h"
 #include "gstrings.h"
 #include "thingdef/thingdef.h"
+*/
 
 static FRandom pr_dripblood ("DripBlood");
 static FRandom pr_knightatk ("KnightAttack");

src/g_heretic/a_wizard.cpp

@@ -1,3 +1,4 @@
+/*
 #include "actor.h"
 #include "info.h"
 #include "m_random.h"
@@ -7,6 +8,7 @@
 #include "a_action.h"
 #include "gstrings.h"
 #include "thingdef/thingdef.h"
+*/
 
 static FRandom pr_wizatk3 ("WizAtk3");
 

src/g_heretic/heretic_sbar.cpp

@@ -14,6 +14,8 @@
 #include "templates.h"
 #include "a_keys.h"
 #include "r_translate.h"
+#include "g_level.h"
+#include "v_palette.h"
 
 
 static FRandom pr_chainwiggle;

src/g_hexen/a_bats.cpp

@@ -1,9 +1,11 @@
+/*
 #include "actor.h"
 #include "info.h"
 #include "m_random.h"
 #include "p_local.h"
 #include "s_sound.h"
 #include "thingdef/thingdef.h"
+*/
 
 static FRandom pr_batspawn ("BatSpawn");
 static FRandom pr_batmove ("BatMove");

src/g_hexen/a_bishop.cpp

@@ -1,12 +1,13 @@
+/*
 #include "actor.h"
 #include "info.h"
 #include "p_local.h"
 #include "s_sound.h"
-#include "p_enemy.h"
 #include "a_action.h"
 #include "m_random.h"
 #include "a_hexenglobal.h"
 #include "thingdef/thingdef.h"
+*/
 
 static FRandom pr_boom ("BishopBoom");
 static FRandom pr_atk ("BishopAttack");

src/g_hexen/a_blastradius.cpp

@@ -1,3 +1,4 @@
+/*
 #include "info.h"
 #include "a_pickups.h"
 #include "a_artifacts.h"
@@ -5,6 +6,7 @@
 #include "p_local.h"
 #include "p_enemy.h"
 #include "s_sound.h"
+*/
 
 #define BLAST_RADIUS_DIST	255*FRACUNIT
 #define BLAST_SPEED			20*FRACUNIT

src/g_hexen/a_boostarmor.cpp

@@ -1,3 +1,4 @@
+/*
 #include "info.h"
 #include "a_pickups.h"
 #include "a_artifacts.h"
@@ -5,6 +6,7 @@
 #include "p_local.h"
 #include "gi.h"
 #include "s_sound.h"
+*/
 
 // Boost Armor Artifact (Dragonskin Bracers) --------------------------------
 

src/g_hexen/a_centaur.cpp

@@ -1,8 +1,10 @@
+/*
 #include "actor.h"
 #include "p_enemy.h"
 #include "a_action.h"
 #include "m_random.h"
 #include "thingdef/thingdef.h"
+*/
 
 static FRandom pr_centaurdefend ("CentaurDefend");
 

src/g_hexen/a_clericflame.cpp

@@ -1,3 +1,4 @@
+/*
 #include "actor.h"
 #include "gi.h"
 #include "m_random.h"
@@ -5,12 +6,12 @@
 #include "d_player.h"
 #include "a_action.h"
 #include "p_local.h"
-#include "p_enemy.h"
 #include "a_action.h"
 #include "p_pspr.h"
 #include "gstrings.h"
 #include "a_hexenglobal.h"
 #include "thingdef/thingdef.h"
+*/
 
 const fixed_t FLAMESPEED	= fixed_t(0.45*FRACUNIT);
 const fixed_t CFLAMERANGE	= 12*64*FRACUNIT;

src/g_hexen/a_clericholy.cpp

@@ -1,13 +1,16 @@
+/*
 #include "actor.h"
 #include "info.h"
 #include "p_local.h"
 #include "m_random.h"
 #include "s_sound.h"
-#include "p_enemy.h"
 #include "a_hexenglobal.h"
 #include "gstrings.h"
 #include "a_weaponpiece.h"
 #include "thingdef/thingdef.h"
+#include "g_level.h"
+#include "doomstat.h"
+*/
 
 #define BLAST_FULLSTRENGTH	255
 

src/g_hexen/a_clericmace.cpp

@@ -1,11 +1,13 @@
+/*
 #include "m_random.h"
 #include "p_local.h"
 #include "a_hexenglobal.h"
 #include "thingdef/thingdef.h"
+*/
 
 extern void AdjustPlayerAngle (AActor *pmo, AActor *linetarget);
 
-static FRandom pr_atk ("CMaceAttack");
+static FRandom pr_maceatk ("CMaceAttack");
 
 //===========================================================================
 //
@@ -27,7 +29,7 @@ DEFINE_ACTION_FUNCTION(AActor, A_CMaceAttack)
 		return;
 	}
 
-	damage = 25+(pr_atk()&15);
+	damage = 25+(pr_maceatk()&15);
 	for (i = 0; i < 16; i++)
 	{
 		angle = player->mo->angle+i*(ANG45/16);

src/g_hexen/a_clericstaff.cpp

@@ -1,3 +1,4 @@
+/*
 #include "actor.h"
 #include "gi.h"
 #include "m_random.h"
@@ -5,12 +6,12 @@
 #include "d_player.h"
 #include "a_action.h"
 #include "p_local.h"
-#include "p_enemy.h"
 #include "a_action.h"
 #include "p_pspr.h"
 #include "gstrings.h"
 #include "a_hexenglobal.h"
 #include "thingdef/thingdef.h"
+*/
 
 static FRandom pr_staffcheck ("CStaffCheck");
 static FRandom pr_blink ("CStaffBlink");

src/g_hexen/a_dragon.cpp

@@ -1,3 +1,4 @@
+/*
 #include "actor.h"
 #include "info.h"
 #include "p_enemy.h"
@@ -6,7 +7,7 @@
 #include "m_random.h"
 #include "s_sound.h"
 #include "thingdef/thingdef.h"
-
+*/
 
 static FRandom pr_dragonseek ("DragonSeek");
 static FRandom pr_dragonflight ("DragonFlight");

src/g_hexen/a_fighteraxe.cpp

@@ -1,3 +1,4 @@
+/*
 #include "actor.h"
 #include "gi.h"
 #include "m_random.h"
@@ -5,17 +6,16 @@
 #include "d_player.h"
 #include "a_action.h"
 #include "p_local.h"
-#include "p_enemy.h"
 #include "a_action.h"
 #include "p_pspr.h"
 #include "gstrings.h"
 #include "a_hexenglobal.h"
-#include "p_effect.h"
 #include "thingdef/thingdef.h"
+*/
 
 #define AXERANGE	((fixed_t)(2.25*MELEERANGE))
 
-static FRandom pr_atk ("FAxeAtk");
+static FRandom pr_axeatk ("FAxeAtk");
 
 void A_FAxeCheckReady (AActor *actor);
 void A_FAxeCheckUp (AActor *actor);
@@ -203,8 +203,8 @@ DEFINE_ACTION_FUNCTION(AActor, A_FAxeAttack)
 	}
 	AActor *pmo=player->mo;
 
-	damage = 40+(pr_atk()&15);
-	damage += pr_atk()&7;
+	damage = 40+(pr_axeatk()&15);
+	damage += pr_axeatk()&7;
 	power = 0;
 	weapon = player->ReadyWeapon;
 	if (player->ReadyWeapon->Ammo1->Amount > 0)