diff --git a/acconfig.h b/acconfig.h index 7902d7bed..b36c0e341 100644 --- a/acconfig.h +++ b/acconfig.h @@ -16,9 +16,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 @@ -31,12 +28,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 to the base directory for the client to download skins to */ -#undef SKINBASE - /* Define this to use experimental code */ #undef _EXPERIMENTAL_ diff --git a/configure.in b/configure.in index 991516f08..3a8af88cf 100644 --- a/configure.in +++ b/configure.in @@ -1037,32 +1037,13 @@ 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(oldstyle, -[ --with-oldstyle compile with defaults used by Id Software instead - of the slightly saner defaults normally used by - QuakeForge.], - oldstyle=$withval, oldstyle=auto -) -AC_MSG_CHECKING([configuration style]) -if test "x$oldstyle" = xyes -o "x$oldstyle" = "x"; then - AC_MSG_RESULT([old style (id Software defaults)]) - AC_DEFINE(BASEGAME, "id1") - AC_DEFINE(SKINBASE, "qw") - if test "x$SYSTYPE" = xWIN32; then - default_globalconf="%WINDIR%/$PACKAGE.conf" - default_userconf="" - else - default_globalconf="/etc/$PACKAGE.conf" - default_userconf="" - fi +if test "x$SYSTYPE" = xWIN32; then + default_globalconf="%WINDIR%/${PACKAGE}.conf" + default_userconf="~/${PACKAGE}.rc" default_sharepath="." default_userpath="." else - AC_MSG_RESULT([new style]) - AC_DEFINE(NEWSTYLE) - AC_DEFINE(BASEGAME, "base") - AC_DEFINE(SKINBASE, "base") - default_globalconf="/etc/$PACKAGE.conf" + default_globalconf="/etc/${PACKAGE}.conf" default_userconf="~/.${PACKAGE}rc" eval foo="$datadir" default_sharepath="$foo/games/$PACKAGE" diff --git a/nq/include/win32/bc/config.h b/nq/include/win32/bc/config.h index 612951cfe..d84e48607 100644 --- a/nq/include/win32/bc/config.h +++ b/nq/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/nq/include/win32/vc/config.h b/nq/include/win32/vc/config.h index 117ac4255..cc66dc685 100644 --- a/nq/include/win32/vc/config.h +++ b/nq/include/win32/vc/config.h @@ -65,16 +65,6 @@ /* Version string */ #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/nq/source/quakefs.c b/nq/source/quakefs.c index 300bf35bd..9995315ea 100644 --- a/nq/source/quakefs.c +++ b/nq/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"); /* diff --git a/qw/include/win32/bc/config.h b/qw/include/win32/bc/config.h index def126fe0..e4943b692 100644 --- a/qw/include/win32/bc/config.h +++ b/qw/include/win32/bc/config.h @@ -65,23 +65,6 @@ /* Version string */ #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 this to the base directory for the client to download skins to */ -#ifdef NEWSTYLE -# define SKINBASE "base" -#else -# define SKINBASE "qw" -#endif - /* Define if you have the XFree86 DGA extension */ #undef HAVE_DGA diff --git a/qw/include/win32/mingw/config.h b/qw/include/win32/mingw/config.h index 67211b6ae..6dbd0cadd 100644 --- a/qw/include/win32/mingw/config.h +++ b/qw/include/win32/mingw/config.h @@ -68,23 +68,6 @@ /* Version string */ #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 this to the base directory for the client to download skins to */ -#ifdef NEWSTYLE -# define SKINBASE "base" -#else -# define SKINBASE "qw" -#endif - /* Define if you have the XFree86 DGA extension */ #undef HAVE_DGA diff --git a/qw/include/win32/vc/config.h b/qw/include/win32/vc/config.h index e67531758..aea941436 100644 --- a/qw/include/win32/vc/config.h +++ b/qw/include/win32/vc/config.h @@ -75,23 +75,6 @@ /* Version string */ #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 this to the base directory for the client to download skins to */ -#ifdef NEWSTYLE -# define SKINBASE "base" -#else -# define SKINBASE "qw" -#endif - /* Define if you have the XFree86 DGA extension */ #undef HAVE_DGA diff --git a/qw/source/quakefs.c b/qw/source/quakefs.c index 6bcfd083b..d48c10494 100644 --- a/qw/source/quakefs.c +++ b/qw/source/quakefs.c @@ -1082,15 +1082,10 @@ COM_Filesystem_Init_Cvars (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"); -#ifdef NEWSTYLE - fs_skinbase= Cvar_Get ("fs_skinbase", fs_basegame->string, CVAR_ROM, + fs_skinbase= Cvar_Get ("fs_skinbase", "qw", CVAR_ROM, "location of skins dir for downloads"); -#else - fs_skinbase= Cvar_Get ("fs_skinbase", SKINBASE, CVAR_ROM, - "location of skins dir for downloads"); -#endif } /*