Almost there...

common/Makefile.in

@@ -1,3 +1,32 @@
+#!/usr/bin/make -f
+#	common/Makefile.in
+#
+#	common makefile
+#
+#	Copyright (C) 1996-1997  Id Software, Inc.
+#	Copyright (C) 1999,2000  contributors of the QuakeForge project
+#	Please see the file "AUTHORS" for a list of contributors
+#
+#	This program is free software; you can redistribute it and/or
+#	modify it under the terms of the GNU General Public License
+#	as published by the Free Software Foundation; either version 2
+#	of the License, or (at your option) any later version.
+#
+#	This program is distributed in the hope that it will be useful,
+#	but WITHOUT ANY WARRANTY; without even the implied warranty of
+#	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+#
+#	See the GNU General Public License for more details.
+#
+#	You should have received a copy of the GNU General Public License
+#	along with this program; if not, write to:
+#
+#		Free Software Foundation, Inc.
+#		59 Temple Place - Suite 330
+#		Boston, MA  02111-1307, USA
+#
+#	$Id$
+
 ########################################################################
 #
 # Quake general stuff

common/qargs.c

@@ -1,7 +1,10 @@
 /*
-qargs.c - command line argument processing routines
+	qargs.c
+
+	command line argument processing routines
+
 	Copyright (C) 1996-1997  Id Software, Inc.
-Portions Copyright (C) 1999,2000  Nelson Rush.
+	Copyright (C) 1999,2000  Nelson Rush.
 	Copyright (C) 1999,2000  contributors of the QuakeForge project
 	Please see the file "AUTHORS" for a list of contributors
 
@@ -17,15 +20,16 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 	See the GNU General Public License for more details.
 
 	You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
+	along with this program; if not, write to:
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
+		Free Software Foundation, Inc.
+		59 Temple Place - Suite 330
+		Boston, MA  02111-1307, USA
+
+	$Id$
 */
 
-#include "config.h"
+#include <config.h>
-#ifdef HAVE_MALLOC_H /* QF being compiled with -Werror */
-# include <malloc.h> /* causes OpenBSD's build to fail here */
-#endif
 #include <string.h>
 #include <ctype.h>
 #include <stdlib.h>
@@ -37,7 +41,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include <console.h>
 #include <client.h>
 #include <assert.h>
-#include "lib_replace.h"
+#include <lib_replace.h>
 
 usercmd_t nullcmd; // guarenteed to be zero
 
@@ -52,7 +56,6 @@ static char	*safeargvs[] =
 int		com_argc;
 char	**com_argv;
 char	*com_cmdline;
-//cvar_t  cmdline = {"cmdline","0", false, true};
 cvar_t	*cmdline;
 
 /*

common/qargs.h

@@ -1,4 +1,8 @@
 /*
+	qargs.h
+
+	(description)
+
 	Copyright (C) 1996-1997  Id Software, Inc.
 	Copyright (C) 1999,2000  contributors of the QuakeForge project
 	Please see the file "AUTHORS" for a list of contributors
@@ -15,16 +19,19 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 	See the GNU General Public License for more details.
 
 	You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
+	along with this program; if not, write to:
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
+		Free Software Foundation, Inc.
+		59 Temple Place - Suite 330
+		Boston, MA  02111-1307, USA
+
+	$Id$
 */
-// comndef.h  -- general definitions
 
 #ifndef _QARGS_H
 #define _QARGS_H
 
-#include "qtypes.h"
+#include <qtypes.h>
 
 extern	int		com_argc;
 extern	char	**com_argv;

common/qdefs.h

@@ -1,4 +1,8 @@
 /*
+	qdefs.h
+
+	(description)
+
 	Copyright (C) 1996-1997  Id Software, Inc.
 	Copyright (C) 1999,2000  contributors of the QuakeForge project
 	Please see the file "AUTHORS" for a list of contributors
@@ -15,10 +19,15 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 	See the GNU General Public License for more details.
 
 	You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
+	along with this program; if not, write to:
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
+		Free Software Foundation, Inc.
+		59 Temple Place - Suite 330
+		Boston, MA  02111-1307, USA
+
+	$Id$
 */
+
 #ifndef _QDEFS_H
 #define _QDEFS_H
 

common/qendian.c

@@ -1,6 +1,9 @@
 /*
+	qendian.c
+
+	(description)
+
 	Copyright (C) 1996-1997  Id Software, Inc.
-Portions Copyright (C) 1999,2000  Nelson Rush.
 	Copyright (C) 1999,2000  contributors of the QuakeForge project
 	Please see the file "AUTHORS" for a list of contributors
 
@@ -16,14 +19,17 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 	See the GNU General Public License for more details.
 
 	You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
+	along with this program; if not, write to:
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
+		Free Software Foundation, Inc.
+		59 Temple Place - Suite 330
+		Boston, MA  02111-1307, USA
+
+	$Id$
 */
-// common.c -- misc functions used in client and server
 
 #include <ctype.h>
-#include "qtypes.h"
+#include <qtypes.h>
 
 /*
 ============================================================================

common/qendian.h

@@ -1,4 +1,8 @@
 /*
+	qendian.h
+
+	(description)
+
 	Copyright (C) 1996-1997  Id Software, Inc.
 	Copyright (C) 1999,2000  contributors of the QuakeForge project
 	Please see the file "AUTHORS" for a list of contributors
@@ -15,11 +19,14 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 	See the GNU General Public License for more details.
 
 	You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
+	along with this program; if not, write to:
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
+		Free Software Foundation, Inc.
+		59 Temple Place - Suite 330
+		Boston, MA  02111-1307, USA
+
+	$Id$
 */
-// comndef.h  -- general definitions
 
 #ifndef _QENDIAN_H
 #define _QENDIAN_H

common/qstructs.h

@@ -1,5 +1,8 @@
 /*
-qstructs.h - common structures
+	qstructs.h
+
+	common structures
+
 	Copyright (C) 1996-1997  Id Software, Inc.
 	Copyright (C) 1999,2000  contributors of the QuakeForge project
 	Please see the file "AUTHORS" for a list of contributors
@@ -16,9 +19,13 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 	See the GNU General Public License for more details.
 
 	You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
+	along with this program; if not, write to:
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
+		Free Software Foundation, Inc.
+		59 Temple Place - Suite 330
+		Boston, MA  02111-1307, USA
+
+	$Id$
 */
 #ifndef _QSTRUCTS_H
 #define _QSTRUCTS_H

common/qtypes.h

@@ -1,4 +1,8 @@
 /*
+	qtypes.h
+
+	(description)
+
 	Copyright (C) 1996-1997  Id Software, Inc.
 	Copyright (C) 1999,2000  contributors of the QuakeForge project
 	Please see the file "AUTHORS" for a list of contributors
@@ -15,10 +19,15 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 	See the GNU General Public License for more details.
 
 	You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
+	along with this program; if not, write to:
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
+		Free Software Foundation, Inc.
+		59 Temple Place - Suite 330
+		Boston, MA  02111-1307, USA
+
+	$Id$
 */
+
 #ifndef _QTYPES_H
 #define _QTYPES_H
 

common/quakeasm.h

@@ -1,4 +1,8 @@
 /*
+	quakeasm.h
+
+	general asm header file
+
 	Copyright (C) 1996-1997  Id Software, Inc.
 	Copyright (C) 1999,2000  contributors of the QuakeForge project
 	Please see the file "AUTHORS" for a list of contributors
@@ -15,13 +19,14 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 	See the GNU General Public License for more details.
 
 	You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
+	along with this program; if not, write to:
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
+		Free Software Foundation, Inc.
+		59 Temple Place - Suite 330
+		Boston, MA  02111-1307, USA
+
+	$Id$
 */
-//
-// quakeasm.h: general asm header file
-//
 
 #ifdef _WIN32
 #define __i386__	1

common/quakedef.h

@@ -1,5 +1,8 @@
 /*
-quakedef.h - primary header for client
+	quakedef.h
+
+	primary header for client
+
 	Copyright (C) 1996-1997  Id Software, Inc.
 	Copyright (C) 1999,2000  contributors of the QuakeForge project
 	Please see the file "AUTHORS" for a list of contributors
@@ -16,13 +19,17 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 	See the GNU General Public License for more details.
 
 	You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
+	along with this program; if not, write to:
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
+		Free Software Foundation, Inc.
+		59 Temple Place - Suite 330
+		Boston, MA  02111-1307, USA
+
+	$Id$
 */
 
-#ifndef _QW_COMMON_QUAKEDEF_H
+#ifndef _QUAKEDEF_H
-#define _QW_COMMON_QUAKEDEF_H
+#define _QUAKEDEF_H
 
 #include <common_quakedef.h>
 
@@ -50,4 +57,4 @@ void Chase_Init (void);
 void Chase_Reset (void);
 void Chase_Update (void);
 
-#endif /* _QW_COMMON_QUAKEDEF_H */
+#endif /* _QUAKEDEF_H */

common/quakefs.c

@@ -1,7 +1,10 @@
 /*
-quakefs.c - virtual filesystem functions
+	quakefs.c
+
+	virtual filesystem functions
+
 	Copyright (C) 1996-1997  Id Software, Inc.
-Portions Copyright (C) 1999,2000  Nelson Rush.
+	Copyright (C) 1999,2000  Nelson Rush.
 	Copyright (C) 1999,2000  contributors of the QuakeForge project
 	Please see the file "AUTHORS" for a list of contributors
 
@@ -17,12 +20,16 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 	See the GNU General Public License for more details.
 
 	You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
+	along with this program; if not, write to:
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
+		Free Software Foundation, Inc.
+		59 Temple Place - Suite 330
+		Boston, MA  02111-1307, USA
+
+	$Id$
 */
 
-#include "config.h"
+#include <config.h>
 #include <ctype.h>
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>

common/quakefs.h

@@ -1,5 +1,8 @@
 /*
-quakefs.h - quake virtual filesystem definitions
+	quakefs.h
+
+	quake virtual filesystem definitions
+
 	Copyright (C) 1996-1997  Id Software, Inc.
 	Copyright (C) 1999,2000  contributors of the QuakeForge project
 	Please see the file "AUTHORS" for a list of contributors
@@ -16,16 +19,20 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 	See the GNU General Public License for more details.
 
 	You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
+	along with this program; if not, write to:
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
+		Free Software Foundation, Inc.
+		59 Temple Place - Suite 330
+		Boston, MA  02111-1307, USA
+
+	$Id$
 */
 
 #ifndef _QUAKEFS_H
 #define _QUAKEFS_H
-#include "config.h"
 
-#include "quakeio.h"
+#include <config.h>
+#include <quakeio.h>
 
 //============================================================================
 

common/quakeio.c

@@ -1,10 +1,40 @@
-#include "config.h"
+/*
+	quakeio.c
+
+	(description)
+
+	Copyright (C) 1996-1997  Id Software, Inc.
+	Copyright (C) 1999,2000  contributors of the QuakeForge project
+	Please see the file "AUTHORS" for a list of contributors
+
+	This program is free software; you can redistribute it and/or
+	modify it under the terms of the GNU General Public License
+	as published by the Free Software Foundation; either version 2
+	of the License, or (at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+	See the GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to:
+
+		Free Software Foundation, Inc.
+		59 Temple Place - Suite 330
+		Boston, MA  02111-1307, USA
+
+	$Id$
+*/
+
+#include <config.h>
 #ifdef HAVE_MALLOC_H
 #include <malloc.h>
 #endif
 #include <stdarg.h>
 #include <stdlib.h>
-#include "quakeio.h"
+#include <quakeio.h>
 #ifdef WIN32
 #include <io.h>
 #include <fcntl.h>

common/quakeio.h

@@ -1,9 +1,38 @@
+/*
+	quakeio.h
+
+	(description)
+
+	Copyright (C) 1996-1997  Id Software, Inc.
+	Copyright (C) 1999,2000  contributors of the QuakeForge project
+	Please see the file "AUTHORS" for a list of contributors
+
+	This program is free software; you can redistribute it and/or
+	modify it under the terms of the GNU General Public License
+	as published by the Free Software Foundation; either version 2
+	of the License, or (at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+	See the GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to:
+
+		Free Software Foundation, Inc.
+		59 Temple Place - Suite 330
+		Boston, MA  02111-1307, USA
+
+	$Id$
+*/
 #ifndef __quake_io_h
 #define __quake_io_h
 
 #include <stdio.h>
 
-#include "config.h"
+#include <config.h>
 #ifdef HAS_ZLIB
 #include <zlib.h>
 #else

common/wad.c

@@ -1,4 +1,8 @@
 /*
+	wad.c
+
+	(description)
+
 	Copyright (C) 1996-1997  Id Software, Inc.
 	Copyright (C) 1999,2000  contributors of the QuakeForge project
 	Please see the file "AUTHORS" for a list of contributors
@@ -15,19 +19,22 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 	See the GNU General Public License for more details.
 
 	You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
+	along with this program; if not, write to:
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
+		Free Software Foundation, Inc.
+		59 Temple Place - Suite 330
+		Boston, MA  02111-1307, USA
+
+	$Id$
 */
-// wad.c
 
-#include "qtypes.h"
+#include <qtypes.h>
-#include "quakedef.h"
+#include <quakedef.h>
-#include "wad.h"
+#include <wad.h>
-#include "quakefs.h"
+#include <quakefs.h>
-#include "qendian.h"
+#include <qendian.h>
-#include "sys.h"
+#include <sys.h>
-#include "console.h"
+#include <console.h>
 
 int			wad_numlumps;
 lumpinfo_t	*wad_lumps;

common/wad.h

@@ -1,4 +1,8 @@
 /*
+	wad.h
+
+	(description)
+
 	Copyright (C) 1996-1997  Id Software, Inc.
 	Copyright (C) 1999,2000  contributors of the QuakeForge project
 	Please see the file "AUTHORS" for a list of contributors
@@ -15,11 +19,14 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 	See the GNU General Public License for more details.
 
 	You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
+	along with this program; if not, write to:
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
+		Free Software Foundation, Inc.
+		59 Temple Place - Suite 330
+		Boston, MA  02111-1307, USA
+
+	$Id$
 */
-// wad.h
 
 #ifndef _WAD_H
 #define _WAD_H

common/winquake.h

@@ -1,4 +1,8 @@
 /*
+	winquake.h
+
+	Win32-specific Quake header file
+
 	Copyright (C) 1996-1997  Id Software, Inc.
 	Copyright (C) 1999,2000  contributors of the QuakeForge project
 	Please see the file "AUTHORS" for a list of contributors
@@ -15,11 +19,14 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 	See the GNU General Public License for more details.
 
 	You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
+	along with this program; if not, write to:
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
+		Free Software Foundation, Inc.
+		59 Temple Place - Suite 330
+		Boston, MA  02111-1307, USA
+
+	$Id$
 */
-// winquake.h: Win32-specific Quake header file
 
 #ifdef _WIN32
 #pragma warning( disable : 4229 )  // mgraph gets this

common/world.c

@@ -1,5 +1,8 @@
 /*
-world.c - world query functions
+	world.c
+
+	world query functions
+
 	Copyright (C) 1996-1997  Id Software, Inc.
 	Copyright (C) 1999,2000  contributors of the QuakeForge project
 	Please see the file "AUTHORS" for a list of contributors
@@ -16,9 +19,13 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 	See the GNU General Public License for more details.
 
 	You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
+	along with this program; if not, write to:
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
+		Free Software Foundation, Inc.
+		59 Temple Place - Suite 330
+		Boston, MA  02111-1307, USA
+
+	$Id$
 */
 
 #include <quakedef.h>

common/world.h

@@ -1,5 +1,8 @@
 /*
 	world.h
+
+	(description)
+
 	Copyright (C) 1996-1997  Id Software, Inc.
 	Copyright (C) 1999,2000  contributors of the QuakeForge project
 	Please see the file "AUTHORS" for a list of contributors
@@ -16,9 +19,13 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 	See the GNU General Public License for more details.
 
 	You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
+	along with this program; if not, write to:
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
+		Free Software Foundation, Inc.
+		59 Temple Place - Suite 330
+		Boston, MA  02111-1307, USA
+
+	$Id$
 */
 
 #ifndef _WORLD_H

common/worlda.s

@@ -1,5 +1,11 @@
 /*
+	worlda.s
+
+	x86 assembly-language server testing stuff
+
 	Copyright (C) 1996-1997  Id Software, Inc.
+	Copyright (C) 1999,2000  contributors of the QuakeForge project
+	Please see the file "AUTHORS" for a list of contributors
 
 	This program is free software; you can redistribute it and/or
 	modify it under the terms of the GNU General Public License
@@ -13,19 +19,19 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 	See the GNU General Public License for more details.
 
 	You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
+	along with this program; if not, write to:
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
+		Free Software Foundation, Inc.
+		59 Temple Place - Suite 330
+		Boston, MA  02111-1307, USA
+
+	$Id$
 */
-//
-// worlda.s
-// x86 assembly-language server testing stuff
-//
 
 #define GLQUAKE	1	// don't include unneeded defs
-#include "asm_i386.h"
+#include <asm_i386.h>
-#include "quakeasm.h"
+#include <quakeasm.h>
-#include "d_ifacea.h"
+#include <d_ifacea.h>
 
 #if id386
 

common/zone.c

@@ -1,5 +1,8 @@
 /*
-// zone.c
+	zone.c
+
+	(description)
+
 	Copyright (C) 1996-1997  Id Software, Inc.
 	Copyright (C) 1999,2000  contributors of the QuakeForge project
 	Please see the file "AUTHORS" for a list of contributors
@@ -16,9 +19,13 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 	See the GNU General Public License for more details.
 
 	You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
+	along with this program; if not, write to:
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
+		Free Software Foundation, Inc.
+		59 Temple Place - Suite 330
+		Boston, MA  02111-1307, USA
+
+	$Id$
 */
 
 #include <qtypes.h>

common/zone.h

@@ -1,4 +1,8 @@
 /*
+	zone.h
+
+	(description)
+
 	Copyright (C) 1996-1997  Id Software, Inc.
 	Copyright (C) 1999,2000  contributors of the QuakeForge project
 	Please see the file "AUTHORS" for a list of contributors
@@ -15,9 +19,13 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 	See the GNU General Public License for more details.
 
 	You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
+	along with this program; if not, write to:
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
+		Free Software Foundation, Inc.
+		59 Temple Place - Suite 330
+		Boston, MA  02111-1307, USA
+
+	$Id$
 */
 
 #ifndef _ZONE_H