- Cleaned up some include dependencies.

SVN r1224 (trunk)

docs/rh-log.txt

@@ -1,4 +1,5 @@
 September 14, 2008  (Changes by Graf Zahl)
+- Cleaned up some include dependencies.
 - fixed: For Chex Quest some CVars were initialized to Heretic's default.
 - fixed pickup message for LargeZorchPack.
 

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,10 +34,12 @@
 #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"
 
 // Needs access to LFB.
 #include "v_video.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_func.cpp

@@ -21,6 +21,7 @@
 #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,7 @@ 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"
 
 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/basictypes.h

@@ -0,0 +1,98 @@
+#ifndef __BASICTYPES_H
+#define __BASICTYPES_H
+
+#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
+	};
+};
+
+//
+// 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
+
+
+#endif

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

@@ -28,6 +28,8 @@
 #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 +172,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"

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"
@@ -96,6 +95,9 @@
 #include "teaminfo.h"
 #include "hardware.h"
 #include "sbarinfo.h"
+#include "d_net.h"
+#include "g_level.h"
+#include "d_event.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,8 @@
 #include "st_start.h"
 #include "teaminfo.h"
 #include "p_conversation.h"
+#include "g_level.h"
+#include "d_event.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_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,7 @@
 #include "p_acs.h"
 #include "s_sndseq.h"
 #include "r_interpolate.h"
+#include "doomstat.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

@@ -40,8 +40,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/f_finale.cpp

@@ -46,6 +46,8 @@
 #include "templates.h"
 #include "c_bind.h"
 #include "r_translate.h"
+#include "g_level.h"
+#include "d_event.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

@@ -37,8 +37,6 @@
 #include <stdio.h>
 #include "doomtype.h"
 #include "dobject.h"
-#include "tarray.h"
-#include "name.h"
 
 class FFile
 {
@@ -278,8 +276,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)
 {

src/g_doom/a_bossbrain.cpp

@@ -8,6 +8,8 @@
 #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_doomweaps.cpp

@@ -12,6 +12,7 @@
 #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_painelemental.cpp

@@ -7,6 +7,7 @@
 #include "templates.h"
 #include "m_bbox.h"
 #include "thingdef/thingdef.h"
+#include "doomstat.h"
 
 DECLARE_ACTION(A_SkullAttack)
 

src/g_doom/a_revenant.cpp

@@ -9,6 +9,7 @@
 #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

@@ -8,6 +8,7 @@
 #include "s_sound.h"
 #include "r_translate.h"
 #include "thingdef/thingdef.h"
+#include "g_level.h"
 
 #define MARINE_PAIN_CHANCE 160
 

src/g_doom/doom_sbar.cpp

@@ -15,6 +15,7 @@
 #include "i_system.h"
 #include "r_translate.h"
 #include "sbarinfo.h"
+#include "g_level.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"
@@ -73,6 +72,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_dsparil.cpp

@@ -9,6 +9,7 @@
 #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_hereticweaps.cpp

@@ -14,6 +14,7 @@
 #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

@@ -7,6 +7,7 @@
 #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/heretic_sbar.cpp

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

src/g_hexen/a_clericholy.cpp

@@ -8,6 +8,8 @@
 #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_flechette.cpp

@@ -11,6 +11,7 @@
 #include "a_hexenglobal.h"
 #include "w_wad.h"
 #include "thingdef/thingdef.h"
+#include "g_level.h"
 
 static FRandom pr_poisonbag ("PoisonBag");
 static FRandom pr_poisoncloud ("PoisonCloud");

src/g_hexen/a_healingradius.cpp

@@ -9,6 +9,7 @@
 #include "a_action.h"
 #include "a_hexenglobal.h"
 #include "gi.h"
+#include "doomstat.h"
 
 #define HEAL_RADIUS_DIST	255*FRACUNIT
 

src/g_hexen/a_heresiarch.cpp

@@ -9,6 +9,7 @@
 #include "i_system.h"
 #include "p_acs.h"
 #include "thingdef/thingdef.h"
+#include "g_level.h"
 
 //============================================================================
 //

src/g_hexen/a_hexenspecialdecs.cpp

@@ -12,6 +12,8 @@
 #include "p_lnspec.h"
 #include "a_hexenglobal.h"
 #include "thingdef/thingdef.h"
+#include "g_level.h"
+#include "doomstat.h"
 
 static FRandom pr_pottery ("PotteryExplode");
 static FRandom pr_bit ("PotteryChooseBit");

src/g_hexen/a_korax.cpp

@@ -26,6 +26,7 @@
 #include "m_random.h"
 #include "i_system.h"
 #include "thingdef/thingdef.h"
+#include "g_level.h"
 
 const int KORAX_SPIRIT_LIFETIME = 5*TICRATE/5;	// 5 seconds
 const int KORAX_COMMAND_HEIGHT	= 120;

src/g_hexen/a_magelightning.cpp

@@ -11,6 +11,7 @@
 #include "gstrings.h"
 #include "a_hexenglobal.h"
 #include "thingdef/thingdef.h"
+#include "g_level.h"
 
 #define ZAGSPEED	FRACUNIT
 

src/g_hexen/a_magestaff.cpp

@@ -8,6 +8,7 @@
 #include "gstrings.h"
 #include "a_weaponpiece.h"
 #include "thingdef/thingdef.h"
+#include "doomstat.h"
 
 static FRandom pr_mstafftrack ("MStaffTrack");
 static FRandom pr_bloodscourgedrop ("BloodScourgeDrop");

src/g_hexen/a_summon.cpp

@@ -7,6 +7,7 @@
 #include "s_sound.h"
 #include "ravenshared.h"
 #include "thingdef/thingdef.h"
+#include "g_level.h"
 
 void A_Summon (AActor *);
 

src/g_hexen/a_teleportother.cpp

@@ -8,6 +8,8 @@
 #include "p_lnspec.h"
 #include "m_random.h"
 #include "thingdef/thingdef.h"
+#include "g_level.h"
+#include "doomstat.h"
 
 #define TELEPORT_LIFE 1
 

src/g_hub.cpp

@@ -42,6 +42,8 @@
 #include "files.h"
 #include "m_png.h"
 #include "gstrings.h"
+#include "wi_stuff.h"
+#include "farchive.h"
 
 
 //==========================================================================
@@ -59,7 +61,7 @@ struct FHubInfo
 	int			maxsecret;
 	int			maxfrags;
 
-	wbplayerstruct_s	plyr[MAXPLAYERS];
+	wbplayerstruct_t	plyr[MAXPLAYERS];
 
 	FHubInfo &operator=(const wbstartstruct_t &wbs)
 	{

src/g_hub.h

@@ -2,13 +2,14 @@
 #define __G_HUB_H
 
 #include <stdio.h>
-//#include <m_png.h>
-#include "g_level.h"
-#include "wi_stuff.h"
+
+struct PNGHandle;
+struct cluster_info_t;
+struct wbstartstruct_t;
 
 void G_WriteHubInfo (FILE *file);
 void G_ReadHubInfo (PNGHandle *png);
-void G_LeavingHub(int mode, cluster_info_t * cluster, struct wbstartstruct_s * wbs);
+void G_LeavingHub(int mode, cluster_info_t * cluster, struct wbstartstruct_t * wbs);
 
 #endif
 

src/g_level.cpp

@@ -35,7 +35,6 @@
 #include <assert.h>
 #include "templates.h"
 #include "d_main.h"
-#include "m_alloc.h"
 #include "g_level.h"
 #include "g_game.h"
 #include "s_sound.h"
@@ -75,6 +74,8 @@
 #include "r_translate.h"
 #include "p_lnspec.h"
 #include "r_interpolate.h"
+#include "cmdlib.h"
+#include "d_net.h"
 
 #include "gi.h"
 

src/g_level.h

@@ -36,9 +36,6 @@
 
 #include "doomtype.h"
 #include "doomdef.h"
-#include "m_fixed.h"
-#include "tarray.h"
-#include "name.h"
 
 #define NUM_WORLDVARS			256
 #define NUM_GLOBALVARS			64
@@ -312,7 +309,7 @@ struct EndSequence
 
 extern TArray<EndSequence> EndSequences;
 
-struct cluster_info_s
+struct cluster_info_t
 {
 	int			cluster;
 	char		finaleflat[9];
@@ -325,7 +322,6 @@ struct cluster_info_s
 	char		*clustername;
 	unsigned int cdid;
 };
-typedef struct cluster_info_s cluster_info_t;
 
 // Cluster flags
 #define CLUSTER_HUB				0x00000001	// Cluster uses hub behavior

src/g_raven/a_artitele.cpp

@@ -6,6 +6,7 @@
 #include "gi.h"
 #include "s_sound.h"
 #include "m_random.h"
+#include "doomstat.h"
 
 static FRandom pr_tele ("TeleportSelf");
 

src/g_raven/a_minotaur.cpp

@@ -9,6 +9,8 @@
 #include "gi.h"
 #include "w_wad.h"
 #include "thingdef/thingdef.h"
+#include "g_level.h"
+#include "doomstat.h"
 
 #define MAULATORTICS (25*35)
 

src/g_shared/a_artifacts.cpp

@@ -17,6 +17,8 @@
 #include "v_video.h"
 #include "templates.h"
 #include "a_morph.h"
+#include "g_level.h"
+#include "doomstat.h"
 
 static FRandom pr_torch ("Torch");
 

src/g_shared/a_debris.cpp

@@ -1,6 +1,7 @@
 #include "actor.h"
 #include "info.h"
 #include "m_random.h"
+#include "m_fixed.h"
 
 static FRandom pr_dirt ("SpawnDirt");
 

src/g_shared/a_decals.cpp

@@ -41,6 +41,8 @@
 #include "decallib.h"
 #include "statnums.h"
 #include "c_dispatch.h"
+#include "d_net.h"
+#include "colormatcher.h"
 
 static fixed_t DecalWidth, DecalLeft, DecalRight;
 static fixed_t SpreadZ;

src/g_shared/a_fountain.cpp

@@ -35,6 +35,7 @@
 #include "actor.h"
 #include "info.h"
 #include "p_effect.h"
+#include "doomdata.h"
 
 class AParticleFountain : public AActor
 {

src/g_shared/a_hatetarget.cpp

@@ -34,6 +34,7 @@
 
 #include "actor.h"
 #include "info.h"
+#include "m_fixed.h"
 
 // Hate Target --------------------------------------------------------------
 

src/g_shared/a_keys.cpp

@@ -8,12 +8,13 @@
 #include "sc_man.h"
 #include "v_palette.h"
 #include "w_wad.h"
+#include "doomstat.h"
 
 
 
 struct OneKey
 {
-	const PClass * key;
+	const PClass *key;
 	int count;
 
 	bool check(AActor * owner)
@@ -26,7 +27,7 @@ struct Keygroup
 {
 	TArray<OneKey> anykeylist;
 
-	bool check(AActor * owner)
+	bool check(AActor *owner)
 	{
 		for(unsigned int i=0;i<anykeylist.Size();i++)
 		{
@@ -39,14 +40,13 @@ struct Keygroup
 struct Lock
 {
 	TArray<Keygroup *> keylist;
-	char * message;
-	char * remotemsg;
+	FString Message;
+	FString RemoteMsg;
 	FSoundID locksound;
 	int	rgb;
 
 	Lock()
 	{
-		message=remotemsg=NULL;
 		rgb=0;
 	}
 
@@ -54,8 +54,6 @@ struct Lock
 	{
 		for(unsigned int i=0;i<keylist.Size();i++) delete keylist[i];
 		keylist.Clear();
-		if (message) delete [] message;
-		if (remotemsg) delete [] remotemsg;
 	}
 
 	bool check(AActor * owner)
@@ -80,7 +78,7 @@ struct Lock
 };
 
 
-static Lock * locks[256];		// all valid locks
+static Lock *locks[256];		// all valid locks
 static bool keysdone=false;		// have the locks been initialized?
 static int currentnumber;		// number to be assigned to next key
 static bool ignorekey;			// set to true when the current lock is not being used
@@ -250,12 +248,12 @@ static void ParseLock(FScanner &sc)
 
 		case 1:	// message
 			sc.MustGetString();
-			lock->message = copystring(sc.String);
+			lock->Message = sc.String;
 			break;
 
 		case 2: // remotemsg
 			sc.MustGetString();
-			lock->remotemsg = copystring(sc.String);
+			lock->RemoteMsg = sc.String;
 			break;
 
 		case 3:	// mapcolor
@@ -289,13 +287,13 @@ static void ParseLock(FScanner &sc)
 		}
 	}
 	// copy the messages if the other one does not exist
-	if (!lock->remotemsg && lock->message)
+	if (lock->RemoteMsg.IsEmpty() && lock->Message.IsNotEmpty())
 	{
-		lock->remotemsg = copystring(lock->message);
+		lock->RemoteMsg = lock->Message;
 	}
-	if (!lock->message && lock->remotemsg)
+	if (!lock->Message.IsEmpty() && lock->RemoteMsg.IsNotEmpty())
 	{
-		lock->message = copystring(lock->remotemsg);
+		lock->Message = lock->RemoteMsg;
 	}
 	lock->keylist.ShrinkToFit();
 }
@@ -412,7 +410,7 @@ bool P_CheckKeys (AActor *owner, int keynum, bool remote)
 	else
 	{
 		if (locks[keynum]->check(owner)) return true;
-		failtext = remote? locks[keynum]->remotemsg : locks[keynum]->message;
+		failtext = remote? locks[keynum]->RemoteMsg : locks[keynum]->Message;
 		failsound = locks[keynum]->locksound;
 	}
 

src/g_shared/a_lightning.cpp

@@ -7,6 +7,7 @@
 #include "s_sound.h"
 #include "p_acs.h"
 #include "r_sky.h"
+#include "g_level.h"
 
 static FRandom pr_lightning ("Lightning");
 

src/g_shared/a_morph.cpp

@@ -10,6 +10,8 @@
 #include "a_sharedglobal.h"
 #include "sbar.h"
 #include "a_morph.h"
+#include "doomstat.h"
+#include "g_level.h"
 
 static FRandom pr_morphmonst ("MorphMonster");
 

src/g_shared/a_movingcamera.cpp

@@ -36,6 +36,7 @@
 #include "info.h"
 #include "p_local.h"
 #include "p_lnspec.h"
+#include "doomstat.h"
 
 /*
 == InterpolationPoint: node along a camera's path

src/g_shared/a_pickups.cpp

@@ -15,6 +15,8 @@
 #include "a_morph.h"
 #include "a_specialspot.h"
 #include "thingdef/thingdef.h"
+#include "g_level.h"
+#include "doomstat.h"
 
 static FRandom pr_restore ("RestorePos");
 

src/g_shared/a_puzzleitems.cpp

@@ -6,6 +6,7 @@
 #include "p_enemy.h"
 #include "s_sound.h"
 #include "c_console.h"
+#include "doomstat.h"
 
 IMPLEMENT_CLASS (APuzzleItem)
 

src/g_shared/a_secrettrigger.cpp

@@ -38,6 +38,7 @@
 #include "info.h"
 #include "s_sound.h"
 #include "d_player.h"
+#include "doomstat.h"
 
 EXTERN_CVAR(String, secretmessage)
 

src/g_shared/a_specialspot.cpp

@@ -38,6 +38,7 @@
 #include "statnums.h"
 #include "i_system.h"
 #include "thingdef/thingdef.h"
+#include "doomstat.h"
 
 static FRandom pr_spot ("SpecialSpot");
 static FRandom pr_spawnmace ("SpawnMace");

src/g_shared/a_weapons.cpp

@@ -14,6 +14,8 @@
 #include "templates.h"
 #include "sbar.h"
 #include "thingdef/thingdef.h"
+#include "doomstat.h"
+#include "g_level.h"
 
 #define BONUSADD 6
 

src/g_shared/hudmessages.cpp

@@ -38,6 +38,7 @@
 #include "c_cvars.h"
 #include "v_video.h"
 #include "cmdlib.h"
+#include "doomstat.h"
 
 EXTERN_CVAR (Int, con_scaletext)
 

src/g_shared/sbar.h

@@ -33,7 +33,6 @@
 */
 
 #include "dobject.h"
-#include "m_fixed.h"
 #include "v_collection.h"
 #include "v_text.h"
 

src/g_shared/sbarinfo_display.cpp

@@ -54,6 +54,7 @@
 #include "r_main.h"
 #include "a_weaponpiece.h"
 #include "a_strifeglobal.h"
+#include "g_level.h"
 
 static FRandom pr_chainwiggle; //use the same method of chain wiggling as heretic.
 

src/g_shared/sbarinfo_parser.cpp

@@ -45,6 +45,7 @@
 #include "m_random.h"
 #include "gi.h"
 #include "i_system.h"
+#include "g_level.h"
 
 SBarInfo *SBarInfoScript;
 

src/g_shared/shared_hud.cpp

@@ -46,6 +46,9 @@
 #include "sc_man.h"
 #include "templates.h"
 #include "p_local.h"
+#include "doomstat.h"
+#include "g_level.h"
+
 
 #define HUMETA_AltIcon 0x10f000
 

src/g_shared/shared_sbar.cpp

@@ -47,6 +47,10 @@
 #include "s_sound.h"
 #include "gi.h"
 #include "p_effect.h"
+#include "doomstat.h"
+#include "g_level.h"
+#include "d_net.h"
+#include "colormatcher.h"
 #include "../version.h"
 
 #define XHAIRSHRINKSIZE		(FRACUNIT/18)

src/g_strife/a_acolyte.cpp

@@ -7,6 +7,7 @@
 #include "a_strifeglobal.h"
 #include "doomdata.h"
 #include "thingdef/thingdef.h"
+#include "doomstat.h"
 
 //============================================================================
 //

src/g_strife/a_alienspectres.cpp

@@ -9,6 +9,7 @@
 #include "c_console.h"
 #include "gstrings.h"
 #include "thingdef/thingdef.h"
+#include "doomstat.h"
 
 static FRandom pr_spectrespawn ("AlienSpectreSpawn");
 static FRandom pr_spectrechunk ("212e4");

src/g_strife/a_entityboss.cpp

@@ -6,6 +6,7 @@
 #include "s_sound.h"
 #include "a_strifeglobal.h"
 #include "thingdef/thingdef.h"
+#include "g_level.h"
 
 static FRandom pr_entity ("Entity");
 

src/g_strife/a_programmer.cpp

@@ -7,6 +7,8 @@
 #include "a_strifeglobal.h"
 #include "f_finale.h"
 #include "thingdef/thingdef.h"
+#include "g_level.h"
+#include "doomstat.h"
 
 static FRandom pr_prog ("Programmer");