* Merge ioq3-r1272

4 files changed, 9 insertions, 47 deletions

diff --git a/src/qcommon/common.c b/src/qcommon/common.c
index 3d3cd38d..c074aa74 100644
--- a/src/qcommon/common.c
+++ b/src/qcommon/common.c
@@ -2418,7 +2418,7 @@ void Com_Init( char *commandLine ) {
 
 	// skip the autogen.cfg if "safe" is on the command line
 	if ( !Com_SafeMode() ) {
-		Cbuf_AddText ("exec autogen.cfg\n");
+		Cbuf_AddText ("exec " Q3CONFIG_CFG "\n");
 	}
 
 	Cbuf_AddText ("exec autoexec.cfg\n");
@@ -2562,7 +2562,7 @@ void Com_WriteConfiguration( void ) {
 	}
 	cvar_modifiedFlags &= ~CVAR_ARCHIVE;
 
-	Com_WriteConfigToFile( "autogen.cfg" );
+	Com_WriteConfigToFile( Q3CONFIG_CFG );
 }
 
 
diff --git a/src/qcommon/files.c b/src/qcommon/files.c
index f896929f..0228a4be 100644
--- a/src/qcommon/files.c
+++ b/src/qcommon/files.c
@@ -3200,7 +3200,7 @@ void FS_Restart( int checksumFeed ) {
 	if ( Q_stricmp(fs_gamedirvar->string, lastValidGame) ) {
 		// skip the autogen.cfg if "safe" is on the command line
 		if ( !Com_SafeMode() ) {
-			Cbuf_AddText ("exec autogen.cfg\n");
+			Cbuf_AddText ("exec " Q3CONFIG_CFG "\n");
 		}
 	}
 
diff --git a/src/qcommon/qcommon.h b/src/qcommon/qcommon.h
index e6612453..58ec8745 100644
--- a/src/qcommon/qcommon.h
+++ b/src/qcommon/qcommon.h
@@ -530,6 +530,12 @@ issues.
 
 #define BASEGAME "base"
 
+#ifdef DEDICATED
+#	define Q3CONFIG_CFG "autogen_server.cfg"
+#else
+#	define Q3CONFIG_CFG "autogen.cfg"
+#endif
+
 qboolean FS_Initialized( void );
 
 void	FS_InitFilesystem ( void );
diff --git a/src/qcommon/qfiles.h b/src/qcommon/qfiles.h
index 7e901b79..f0092878 100644
--- a/src/qcommon/qfiles.h
+++ b/src/qcommon/qfiles.h
@@ -70,50 +70,6 @@ typedef struct {
 	int		jtrgLength;			// number of jump table targets
 } vmHeader_t;
 
-
-/*
-========================================================================
-
-PCX files are used for 8 bit images
-
-========================================================================
-*/
-
-typedef struct {
-    char	manufacturer;
-    char	version;
-    char	encoding;
-    char	bits_per_pixel;
-    unsigned short	xmin,ymin,xmax,ymax;
-    unsigned short	hres,vres;
-    unsigned char	palette[48];
-    char	reserved;
-    char	color_planes;
-    unsigned short	bytes_per_line;
-    unsigned short	palette_type;
-    char	filler[58];
-    unsigned char	data;			// unbounded
-} pcx_t;
-
-
-/*
-========================================================================
-
-TGA files are used for 24/32 bit images
-
-========================================================================
-*/
-
-typedef struct _TargaHeader {
-	unsigned char 	id_length, colormap_type, image_type;
-	unsigned short	colormap_index, colormap_length;
-	unsigned char	colormap_size;
-	unsigned short	x_origin, y_origin, width, height;
-	unsigned char	pixel_size, attributes;
-} TargaHeader;
-
-
-
 /*
 ========================================================================