More header cleanup.

SVN r1225 (trunk)

src/am_map.cpp

@@ -40,6 +40,7 @@
 #include "i_system.h"
 #include "c_dispatch.h"
 #include "colormatcher.h"
+#include "d_netinf.h"
 
 // Needs access to LFB.
 #include "v_video.h"

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

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

src/d_dehacked.cpp

@@ -63,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_main.cpp

@@ -83,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"
@@ -98,6 +97,7 @@
 #include "d_net.h"
 #include "g_level.h"
 #include "d_event.h"
+#include "d_netinf.h"
 
 EXTERN_CVAR(Bool, hud_althud)
 void DrawHUD();

src/d_net.cpp

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

@@ -40,8 +40,6 @@
 // case of the generic moving object/actor.
 #include "actor.h"
 
-#include "d_netinf.h"
-
 //Added by MC:
 #include "b_bot.h"
 
@@ -182,6 +180,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/dobjgc.cpp

@@ -70,6 +70,7 @@
 #include "s_sndseq.h"
 #include "r_interpolate.h"
 #include "doomstat.h"
+#include "m_argv.h"
 
 // MACROS ------------------------------------------------------------------
 

src/dsectoreffect.h

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

src/farchive.h

@@ -35,7 +35,6 @@
 #define __FARCHIVE_H__
 
 #include <stdio.h>
-#include "doomtype.h"
 #include "dobject.h"
 
 class FFile

src/g_doom/a_arachnotron.cpp

@@ -2,7 +2,6 @@
 #include "s_sound.h"
 #include "p_local.h"
 #include "p_enemy.h"
-#include "a_doomglobal.h"
 #include "a_action.h"
 #include "thingdef/thingdef.h"
 

src/g_doom/a_archvile.cpp

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

src/g_doom/a_bossbrain.cpp

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

src/g_doom/a_cyberdemon.cpp

@@ -2,7 +2,6 @@
 #include "p_local.h"
 #include "s_sound.h"
 #include "p_enemy.h"
-#include "a_doomglobal.h"
 #include "a_action.h"
 #include "thingdef/thingdef.h"
 

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_doommisc.cpp

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

src/g_doom/a_doomweaps.cpp

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

src/g_doom/a_lostsoul.cpp

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

src/g_doom/a_painelemental.cpp

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

src/g_doom/a_possessed.cpp

@@ -6,7 +6,6 @@
 #include "p_enemy.h"
 #include "gstrings.h"
 #include "a_action.h"
-#include "a_doomglobal.h"
 #include "thingdef/thingdef.h"
 
 static FRandom pr_posattack ("PosAttack");

src/g_doom/a_revenant.cpp

@@ -7,7 +7,6 @@
 #include "p_enemy.h"
 #include "gstrings.h"
 #include "a_action.h"
-#include "a_doomglobal.h"
 #include "thingdef/thingdef.h"
 #include "g_level.h"
 

src/g_heretic/a_hereticmisc.cpp

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

src/g_level.cpp

@@ -76,6 +76,7 @@
 #include "r_interpolate.h"
 #include "cmdlib.h"
 #include "d_net.h"
+#include "d_netinf.h"
 
 #include "gi.h"
 

src/g_shared/a_artifacts.h

@@ -1,7 +1,6 @@
 #ifndef __A_ARTIFACTS_H__
 #define __A_ARTIFACTS_H__
 
-#include "farchive.h"
 #include "a_pickups.h"
 
 #define INVERSECOLOR 0x00345678
@@ -11,15 +10,6 @@
 #define REDCOLOR 0x00beefee
 #define GREENCOLOR 0x00beefad
 
-#define STREAM_ENUM(e) \
-	inline FArchive &operator<< (FArchive &arc, e &i) \
-	{ \
-		BYTE val = (BYTE)i; \
-		arc << val; \
-		i = (e)val; \
-		return arc; \
-	}
-
 class player_t;
 
 // A powerup is a pseudo-inventory item that applies an effect to its

src/g_shared/a_pickups.h

@@ -1,7 +1,6 @@
 #ifndef __A_PICKUPS_H__
 #define __A_PICKUPS_H__
 
-#include "dobject.h"
 #include "actor.h"
 #include "info.h"
 #include "s_sound.h"

src/g_shared/a_randomspawner.cpp

@@ -9,7 +9,6 @@
 #include "p_local.h"
 #include "p_enemy.h"
 #include "s_sound.h"
-#include "a_doomglobal.h"
 #include "statnums.h"
 #include "gstrings.h"
 #include "a_action.h"

src/g_shared/a_sharedglobal.h

@@ -1,7 +1,6 @@
 #ifndef __A_SHAREDGLOBAL_H__
 #define __A_SHAREDGLOBAL_H__
 
-#include "dobject.h"
 #include "info.h"
 #include "actor.h"
 

src/g_shared/a_weaponpiece.cpp

@@ -1,9 +1,17 @@
 #include "a_pickups.h"
 #include "a_weaponpiece.h"
 #include "doomstat.h"
+#include "farchive.h"
 
 IMPLEMENT_CLASS (AWeaponHolder)
 
+void AWeaponHolder::Serialize (FArchive &arc)
+{
+	Super::Serialize(arc);
+	arc << PieceMask << PieceWeapon;
+}
+
+
 IMPLEMENT_POINTY_CLASS (AWeaponPiece)
  DECLARE_POINTER (FullWeapon)
 END_POINTERS

src/g_shared/a_weaponpiece.h

@@ -27,9 +27,5 @@ public:
 	int PieceMask;
 	const PClass * PieceWeapon;
 
-	void Serialize (FArchive &arc)
+	void Serialize (FArchive &arc);
-	{
-		Super::Serialize(arc);
-		arc << PieceMask << PieceWeapon;
-	}
 };

src/g_shared/hudmessages.cpp

@@ -54,6 +54,14 @@ IMPLEMENT_CLASS (DHUDMessageTypeOnFadeOut)
  * Basic HUD message. Appears and disappears without any special effects *
  *************************************************************************/
 
+inline FArchive &operator<< (FArchive &arc, EColorRange &i)
+{
+	BYTE val = (BYTE)i;
+	arc << val;
+	i = (EColorRange)val;
+	return arc;
+}
+
 //============================================================================
 //
 // DHUDMessage Constructor

src/g_strife/a_strifeglobal.h

@@ -1,7 +1,6 @@
 #ifndef __A_STRIFEGLOBAL_H__
 #define __A_STRIFEGLOBAL_H__
 
-#include "dobject.h"
 #include "info.h"
 #include "a_pickups.h"
 

src/g_strife/a_strifestuff.cpp

@@ -6,7 +6,6 @@
 #include "d_player.h"
 #include "a_action.h"
 #include "p_local.h"
-#include "a_doomglobal.h"
 #include "a_strifeglobal.h"
 #include "p_enemy.h"
 #include "p_lnspec.h"

src/hu_scores.cpp

@@ -42,6 +42,7 @@
 #include "v_video.h"
 #include "doomstat.h"
 #include "g_level.h"
+#include "d_netinf.h"
 
 // MACROS ------------------------------------------------------------------
 

src/info.h

@@ -73,8 +73,6 @@
 #endif
 
 #include "dobject.h"
-#include "dthinker.h"
-#include "farchive.h"
 #include "doomdef.h"
 
 const BYTE SF_FULLBRIGHT = 0x40;
@@ -82,6 +80,7 @@ const BYTE SF_FULLBRIGHT = 0x40;
 struct Baggage;
 class FScanner;
 struct FActorInfo;
+class FArchive;
 
 struct FState
 {

src/m_cheat.cpp

@@ -30,7 +30,6 @@
 #include "doomstat.h"
 #include "gstrings.h"
 #include "p_local.h"
-#include "a_doomglobal.h"
 #include "a_strifeglobal.h"
 #include "gi.h"
 #include "p_enemy.h"

src/m_menu.cpp

@@ -70,6 +70,7 @@
 #include "g_level.h"
 #include "d_event.h"
 #include "colormatcher.h"
+#include "d_netinf.h"
 
 // MACROS ------------------------------------------------------------------
 

src/p_conversation.cpp

@@ -55,6 +55,7 @@
 #include "d_net.h"
 #include "g_level.h"
 #include "d_event.h"
+#include "doomstat.h"
 
 // The conversations as they exist inside a SCRIPTxx lump.
 struct Response

src/p_enemy.cpp

@@ -41,7 +41,6 @@
 #include "c_cvars.h"
 #include "p_enemy.h"
 #include "a_sharedglobal.h"
-#include "a_doomglobal.h"
 #include "a_action.h"
 #include "thingdef/thingdef.h"
 #include "d_dehacked.h"

src/p_enemy_a_lookex.cpp

@@ -14,7 +14,6 @@
 #include "c_cvars.h"
 #include "p_enemy.h"
 #include "a_sharedglobal.h"
-#include "a_doomglobal.h"
 #include "a_action.h"
 #include "thingdef/thingdef.h"
 #include "g_level.h"

src/p_interaction.cpp

@@ -47,7 +47,6 @@
 
 #include "b_bot.h"	//Added by MC:
 
-#include "a_doomglobal.h"
 #include "ravenshared.h"
 #include "a_hexenglobal.h"
 #include "a_sharedglobal.h"
@@ -58,6 +57,7 @@
 #include "s_sound.h"
 #include "g_level.h"
 #include "d_net.h"
+#include "d_netinf.h"
 
 static FRandom pr_obituary ("Obituary");
 static FRandom pr_botrespawn ("BotRespawn");

src/p_map.cpp

@@ -49,7 +49,6 @@
 #include "gi.h"
 
 #include "a_sharedglobal.h"
-#include "a_doomglobal.h"
 #include "p_conversation.h"
 #include "r_translate.h"
 #include "g_level.h"

src/p_mobj.cpp

@@ -39,7 +39,6 @@
 #include "c_cvars.h"
 #include "b_bot.h"	//Added by MC:
 #include "stats.h"
-#include "a_doomglobal.h"
 #include "a_hexenglobal.h"
 #include "a_sharedglobal.h"
 #include "gi.h"

src/p_pspr.cpp

@@ -24,7 +24,6 @@
 #include "gi.h"
 #include "p_pspr.h"
 #include "p_effect.h"
-#include "a_doomglobal.h"
 #include "templates.h"
 #include "thingdef/thingdef.h"
 #include "g_level.h"

src/p_pspr.h

@@ -62,6 +62,7 @@ typedef enum
 
 } psprnum_t;
 
+/*
 inline FArchive &operator<< (FArchive &arc, psprnum_t &i)
 {
 	BYTE val = (BYTE)i;
@@ -69,6 +70,7 @@ inline FArchive &operator<< (FArchive &arc, psprnum_t &i)
 	i = (psprnum_t)val;
 	return arc;
 }
+*/
 
 typedef struct pspdef_s
 {

src/p_saveg.h

@@ -34,7 +34,8 @@
 #ifndef __P_SAVEG_H__
 #define __P_SAVEG_H__
 
-#include "farchive.h"
+class FArchive;
+struct PNGHandle;
 
 // Persistent storage/archiving.
 // These are the load / save game routines.

src/p_terrain.h

@@ -34,10 +34,11 @@
 #ifndef __P_TERRAIN_H__
 #define __P_TERRAIN_H__
 
-#include "dobject.h"
 #include "s_sound.h"
 #include "textures/textures.h"
 
+struct PClass;
+
 // This is just a wrapper class so that I don't have to expose FTextureID's implementation
 // to anything that doesn't really need it.
 class FTerrainTypeArray

src/r_defs.h

@@ -35,6 +35,7 @@
 #include "actor.h"
 
 #include "dthinker.h"
+#include "farchive.h"
 
 #define MAXWIDTH 2560
 #define MAXHEIGHT 1600

src/r_things.cpp

@@ -47,6 +47,7 @@
 #include "g_level.h"
 #include "d_net.h"
 #include "colormatcher.h"
+#include "d_netinf.h"
 
 extern FTexture *CrosshairImage;
 extern fixed_t globaluclip, globaldclip;

src/r_translate.cpp

@@ -40,6 +40,7 @@
 #include "v_video.h"
 #include "g_game.h"
 #include "colormatcher.h"
+#include "d_netinf.h"
 
 #include "gi.h"
 #include "stats.h"

src/sdl/hardware.cpp

@@ -42,6 +42,8 @@
 #include "c_dispatch.h"
 #include "sdlvideo.h"
 #include "v_text.h"
+#include "doomstat.h"
+#include "m_argv.h"
 
 EXTERN_CVAR (Bool, ticker)
 EXTERN_CVAR (Bool, fullscreen)

src/sdl/i_system.h

@@ -26,9 +26,10 @@
 #include <dirent.h>
 #include <ctype.h>
 
-#include "d_main.h"
+#include "doomtype.h"
-#include "d_ticcmd.h"
+
-#include "d_event.h"
+struct ticcmd_t;
+struct WadStuff;
 
 #ifndef SHARE_DIR
 #define SHARE_DIR "/usr/local/share/"

src/sound/i_music.h

@@ -35,7 +35,6 @@
 #define __I_MUSIC_H__
 
 #include "doomdef.h"
-#include "doomstat.h"
 
 class FileReader;
 

src/thingdef/thingdef.cpp

@@ -60,7 +60,6 @@
 #include "p_effect.h"
 #include "v_palette.h"
 #include "doomerrors.h"
-#include "a_doomglobal.h"
 #include "a_hexenglobal.h"
 #include "a_weaponpiece.h"
 #include "p_conversation.h"

src/thingdef/thingdef_codeptr.cpp

@@ -61,7 +61,6 @@
 #include "c_console.h"
 #include "doomerrors.h"
 #include "a_sharedglobal.h"
-#include "a_doomglobal.h"
 #include "thingdef/thingdef.h"
 #include "v_video.h"
 #include "doomstat.h"

src/thingdef/thingdef_properties.cpp

@@ -60,7 +60,6 @@
 #include "p_effect.h"
 #include "v_palette.h"
 #include "doomerrors.h"
-#include "a_doomglobal.h"
 #include "a_hexenglobal.h"
 #include "a_weaponpiece.h"
 #include "p_conversation.h"

src/v_font.cpp

@@ -2117,3 +2117,4 @@ void V_InitFonts()
 		ConFont = new FSingleLumpFont ("ConsoleFont", Wads.GetNumForName ("CONFONT"));
 	}
 }
+

src/v_font.h

@@ -71,14 +71,6 @@ enum EColorRange
 
 extern int NumTextColors;
 
-inline FArchive &operator<< (FArchive &arc, EColorRange &i)
-{
-	BYTE val = (BYTE)i;
-	arc << val;
-	i = (EColorRange)val;
-	return arc;
-}
-
 class FFont
 {
 public:

src/win32/hardware.cpp

@@ -45,6 +45,7 @@
 #include "c_dispatch.h"
 #include "v_text.h"
 #include "doomstat.h"
+#include "m_argv.h"
 
 EXTERN_CVAR (Bool, ticker)
 EXTERN_CVAR (Bool, fullscreen)

src/win32/i_system.cpp

@@ -65,6 +65,7 @@
 #include "gameconfigfile.h"
 #include "v_font.h"
 #include "g_level.h"
+#include "doomstat.h"
 
 #include "stats.h"
 

src/win32/win32video.cpp

@@ -63,6 +63,7 @@
 #include "v_pfx.h"
 #include "stats.h"
 #include "doomerrors.h"
+#include "m_argv.h"
 
 #include "win32iface.h"