8f7170d61e
- Remove PORTSCOUT for avoiding version 0.45. - Reduce too high default mouse sensivity in game. - Change USE_GCC from 3.2+ to 3.4+ because it is supported in more archs.
42 lines
1.1 KiB
C
42 lines
1.1 KiB
C
--- qcommon/files.c.orig Wed Jan 4 07:33:05 2006
|
|
+++ qcommon/files.c Sat Dec 30 02:02:16 2006
|
|
@@ -775,6 +775,9 @@
|
|
if (fs_cddir->string[0])
|
|
|
|
FS_AddGameDirectory (va("%s/%s", fs_cddir->string, dir) );
|
|
+#ifdef DATADIR
|
|
+ FS_AddGameDirectory(va("%s/%s", DATADIR, dir));
|
|
+#endif
|
|
#ifdef LIBDIR
|
|
FS_AddGameDirectory(va("%s/%s", LIBDIR, dir));
|
|
#endif
|
|
@@ -999,16 +1002,7 @@
|
|
// basedir <path>
|
|
// allows the game to run from outside the data tree
|
|
//
|
|
-#if defined __unix__
|
|
-#ifdef DATADIR
|
|
- fs_basedir = Cvar_Get("basedir", DATADIR, CVAR_NOSET);
|
|
-#else
|
|
fs_basedir = Cvar_Get("basedir", ".", CVAR_NOSET);
|
|
-#endif
|
|
-#endif
|
|
-#ifdef _WIN32
|
|
- fs_basedir = Cvar_Get ("basedir", ".", CVAR_NOSET);
|
|
-#endif
|
|
|
|
sv_defaultpaks = Cvar_Get ("sv_defaultpaks", "0", CVAR_ARCHIVE);
|
|
|
|
@@ -1024,8 +1018,11 @@
|
|
//
|
|
// start up with baseq2 by default
|
|
//
|
|
+#ifdef DATADIR
|
|
+ FS_AddGameDirectory (va("%s/"BASEDIRNAME, DATADIR) );
|
|
+#endif
|
|
#ifdef LIBDIR
|
|
- FS_AddGameDirectory (va("%s/"BASEDIRNAME, fs_basedir->string) );
|
|
+ FS_AddGameDirectory (va("%s/"BASEDIRNAME, LIBDIR) );
|
|
#endif
|
|
FS_AddGameDirectory(va("%s/"BASEDIRNAME, fs_basedir->string));
|
|
#ifdef DATADIR
|