From 1911b980209ee82c8fdbf138009caac9ed04e769 Mon Sep 17 00:00:00 2001
From: Joseph Carter <knghtbrd@debian.org>
Date: Tue, 22 May 2001 14:39:46 +0000
Subject: [PATCH] The end of newstyle in nuq forever!

---
 Makefile.am               |  2 +-
 acconfig.h                |  6 ------
 configure.in              | 29 +++++++----------------------
 include/win32/bc/config.h | 10 ----------
 include/win32/vc/config.h |  7 +------
 source/quakefs.c          |  2 +-
 6 files changed, 10 insertions(+), 46 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 8a0e16f..f661dab 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,7 +1,7 @@
 ## Process this file with automake to produce Makefile.in
 AUTOMAKE_OPTIONS = foreign
 
-SUBDIRS = include source doc RPM
+SUBDIRS = include source RPM
 
 EXTRA_DIST = tools/gas2masm/Makefile tools/gas2masm/gas2masm.c \
 	tools/gas2masm/gas2masm.dsp tools/gas2masm/gas2masm.dsw \
diff --git a/acconfig.h b/acconfig.h
index 3050a0a..5e7812e 100644
--- a/acconfig.h
+++ b/acconfig.h
@@ -13,9 +13,6 @@
 /* Define this to the QSG standard version you support */
 #undef QSG_VERSION
 
-/* Define if you want to use QF-style defaults instead of Id-style */
-#undef NEWSTYLE
-
 /* Define this to the location of the global config file */
 #undef FS_GLOBALCFG
 
@@ -25,9 +22,6 @@
 /* Define this to the unshared game directory root */
 #undef FS_USERPATH
 
-/* Define this to the base game for the engine to load */
-#undef BASEGAME
-
 /* Define this if you want to use Intel assembly optimizations */
 #undef USE_INTEL_ASM
 
diff --git a/configure.in b/configure.in
index bade025..4887bef 100644
--- a/configure.in
+++ b/configure.in
@@ -848,30 +848,15 @@ dnl Set $prefix and $exec_prefix to $ac_default_prefix if they are not set
 test "x$prefix" = xNONE && prefix=$ac_default_prefix
 test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
 
-AC_ARG_WITH(newstyle,
-[  --with-newstyle         compile with defaults a bit different than those
-                          used by Id Software (does not affect gameplay)],
-	newstyle=$withval, newstyle=auto
-)
-AC_MSG_CHECKING([configuration style])
-if test "x$newstyle" = xyes -o "x$newstyle" = "x"; then
-	AC_MSG_RESULT([new style])
-	AC_DEFINE(NEWSTYLE)
-	AC_DEFINE(BASEGAME, "base")
-	default_globalconf="/etc/$PACKAGE.conf"
-	eval foo="$datadir"
-	default_sharepath="$foo/games/quakeforge"
-	default_userpath="~/.quakeforge"
-else
-	AC_MSG_RESULT([old style (id Software defaults)])
-	AC_DEFINE(BASEGAME, "id1")
-	if test "x$SYSTYPE" = xWIN32; then
-		default_globalconf="%WINDIR%/$PACKAGE.conf"
-	else
-		default_globalconf="/etc/$PACKAGE.conf"
-	fi
+if test "x$SYSTYPE" = xWIN32; then
+	default_globalconf="~/${PACKAGE}.conf"
 	default_sharepath="."
 	default_userpath="."
+else
+	default_globalconf="/etc/${PACKAGE}.conf"
+	eval foo="$datadir"
+	default_sharepath="$foo/games/$PACKAGE"
+	default_userpath="~/.$PACKAGE"
 fi
 
 AC_ARG_WITH(global-cfg,
diff --git a/include/win32/bc/config.h b/include/win32/bc/config.h
index 612951c..d84e486 100644
--- a/include/win32/bc/config.h
+++ b/include/win32/bc/config.h
@@ -65,16 +65,6 @@
 /* Version strings */
 #include "version.h"
 
-/* Define if you want to use QF-style defaults instead of Id-style */
-#undef NEWSTYLE
-
-/* Define this to the subdirectory name of the default game */
-#ifdef NEWSTYLE
-#	define BASEGAME "base"
-#else
-#	define BASEGAME "id1"
-#endif
-
 /* Define if you have the XFree86 DGA extension */
 #undef HAVE_DGA
 
diff --git a/include/win32/vc/config.h b/include/win32/vc/config.h
index 117ac42..f3d9e21 100644
--- a/include/win32/vc/config.h
+++ b/include/win32/vc/config.h
@@ -66,14 +66,9 @@
 #include "..\version.h"
 
 /* Define if you want to use QF-style defaults instead of Id-style */
-#undef NEWSTYLE
 
 /* Define this to the subdirectory name of the default game */
-#ifdef NEWSTYLE
-#	define BASEGAME "base"
-#else
-#	define BASEGAME "id1"
-#endif
+#define BASEGAME "id1"
 
 /* Define if you have the XFree86 DGA extension */
 #undef HAVE_DGA
diff --git a/source/quakefs.c b/source/quakefs.c
index 300bf35..9995315 100644
--- a/source/quakefs.c
+++ b/source/quakefs.c
@@ -930,7 +930,7 @@ COM_InitFilesystem ( void )
 			"location of shared (read only) game directories");
 	fs_userpath = Cvar_Get ("fs_userpath", FS_USERPATH, CVAR_ROM,
 			"location of your game directories");
-	fs_basegame = Cvar_Get ("fs_basegame", BASEGAME, CVAR_ROM,
+	fs_basegame = Cvar_Get ("fs_basegame", "id1", CVAR_ROM,
 			"game to use by default");
 
 /*