[quake3-commits] r1630 - in trunk/code: qcommon sys

[DONOTREPLY at icculus.org]

Author: tma
Date: 2009-09-16 05:30:21 -0400 (Wed, 16 Sep 2009)
New Revision: 1630

Modified:
   trunk/code/qcommon/files.c
   trunk/code/qcommon/qcommon.h
   trunk/code/sys/sys_main.c
Log:
* ...and actually r1626 this time

Modified: trunk/code/qcommon/files.c
===================================================================
--- trunk/code/qcommon/files.c	2009-09-15 09:48:11 UTC (rev 1629)
+++ trunk/code/qcommon/files.c	2009-09-16 09:30:21 UTC (rev 1630)
@@ -241,7 +241,6 @@
 #endif
 
 static	cvar_t		*fs_basepath;
-static	cvar_t		*fs_libpath;
 static	cvar_t		*fs_basegame;
 static	cvar_t		*fs_gamedirvar;
 static	searchpath_t	*fs_searchpaths;
@@ -2762,8 +2761,6 @@
 	fs_debug = Cvar_Get( "fs_debug", "0", 0 );
 	fs_basepath = Cvar_Get ("fs_basepath", Sys_DefaultInstallPath(), CVAR_INIT );
 	fs_basegame = Cvar_Get ("fs_basegame", "", CVAR_INIT );
-	fs_libpath = Cvar_Get ("fs_libpath", Sys_DefaultLibPath(), CVAR_INIT );
-	
 	homePath = Sys_DefaultHomePath();
 	if (!homePath || !homePath[0]) {
 		homePath = fs_basepath->string;

Modified: trunk/code/qcommon/qcommon.h
===================================================================
--- trunk/code/qcommon/qcommon.h	2009-09-15 09:48:11 UTC (rev 1629)
+++ trunk/code/qcommon/qcommon.h	2009-09-16 09:30:21 UTC (rev 1630)
@@ -1079,9 +1079,6 @@
 char    *Sys_DefaultAppPath(void);
 #endif
 
-void	Sys_SetDefaultLibPath(const char *path);
-char	*Sys_DefaultLibPath(void);
-
 void  Sys_SetDefaultHomePath(const char *path);
 char	*Sys_DefaultHomePath(void);
 const char *Sys_Dirname( char *path );

Modified: trunk/code/sys/sys_main.c
===================================================================
--- trunk/code/sys/sys_main.c	2009-09-15 09:48:11 UTC (rev 1629)
+++ trunk/code/sys/sys_main.c	2009-09-16 09:30:21 UTC (rev 1630)
@@ -49,7 +49,6 @@
 
 static char binaryPath[ MAX_OSPATH ] = { 0 };
 static char installPath[ MAX_OSPATH ] = { 0 };
-static char libPath[ MAX_OSPATH ] = { 0 };
 
 /*
 =================
@@ -96,29 +95,6 @@
 
 /*
 =================
-Sys_SetDefaultLibPath
-=================
-*/
-void Sys_SetDefaultLibPath(const char *path)
-{
-	Q_strncpyz(libPath, path, sizeof(libPath));
-}
-
-/*
-=================
-Sys_DefaultLibPath
-=================
-*/
-char *Sys_DefaultLibPath(void)
-{
-	if (*libPath)
-		return libPath;
-	else
-		return Sys_Cwd();
-}
-
-/*
-=================
 Sys_DefaultAppPath
 =================
 */
@@ -408,7 +384,6 @@
 #1 look down current path
 #2 look in fs_homepath
 #3 look in fs_basepath
-#4 look in fs_libpath
 =================
 */
 void *Sys_LoadDll( const char *name, char *fqpath ,
@@ -419,7 +394,6 @@
 	void  (*dllEntry)( intptr_t (*syscallptr)(intptr_t, ...) );
 	char  fname[MAX_OSPATH];
 	char  *basepath;
-	char  *libpath;
 	char  *homepath;
 	char  *pwdpath;
 	char  *gamedir;
@@ -431,7 +405,6 @@
 	// TODO: use fs_searchpaths from files.c
 	pwdpath = Sys_Cwd();
 	basepath = Cvar_VariableString( "fs_basepath" );
-	libpath = Cvar_VariableString( "fs_libpath" );
 	homepath = Cvar_VariableString( "fs_homepath" );
 	gamedir = Cvar_VariableString( "fs_game" );
 
@@ -443,9 +416,6 @@
 	if(!libHandle && basepath)
 		libHandle = Sys_TryLibraryLoad(basepath, gamedir, fname, fqpath);
 
-	if(!libHandle && libpath)
-		libHandle = Sys_TryLibraryLoad(libpath, gamedir, fname, fqpath);
-
 	if(!libHandle) {
 		Com_Printf ( "Sys_LoadDll(%s) failed to load library\n", name );
 		return NULL;
@@ -499,14 +469,6 @@
 #	endif
 #endif
 
-#ifndef DEFAULT_LIBDIR
-#	ifdef MACOS_X
-#		define DEFAULT_LIBDIR Sys_StripAppBundle(Sys_BinaryPath())
-#	else
-#		define DEFAULT_LIBDIR Sys_BinaryPath()
-#	endif
-#endif
-
 /*
 =================
 Sys_SigHandler
@@ -576,7 +538,6 @@
 	Sys_ParseArgs( argc, argv );
 	Sys_SetBinaryPath( Sys_Dirname( argv[ 0 ] ) );
 	Sys_SetDefaultInstallPath( DEFAULT_BASEDIR );
-	Sys_SetDefaultLibPath( DEFAULT_LIBDIR );
 
 	// Concatenate the command line for passing to Com_Init
 	for( i = 1; i < argc; i++ )