qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2025-01-30 12:40:42 +00:00
Code Issues Projects Releases Packages Wiki Activity

NEWSTYLE is gone, sortof. The Cvar defaults for NEWSTYLE are now just the

Browse source 
defaults in non-win32 targets.  BASEDIR/SKINBASE are gone and the Cvars
which use them in the code are just given the oldstyle defaults now.  Use
of "base" is gone.  It was a half-assed solution to a problem that doesn't
exist yet.  When it finally does exist, we'll fix it right.
This commit is contained in:
Joseph Carter 2001-02-20 23:06:48 +00:00
parent 9438b77fdf
commit c2cea45217
9 changed files with 7 additions and 111 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
acconfig.h
View file

@ -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_

25
configure.in
View file

@ -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
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"

10
nq/include/win32/bc/config.h
View file

@ -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

10
nq/include/win32/vc/config.h
View file

@ -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

2
nq/source/quakefs.c
View file

@ -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");
/*

17
qw/include/win32/bc/config.h
View file

@ -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

17
qw/include/win32/mingw/config.h
View file

@ -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

17
qw/include/win32/vc/config.h
View file

@ -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

9
qw/source/quakefs.c
View file

@ -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
}
/*