Merge remote-tracking branch 'ttimo/master'

[xonotic/netradiant.git] / tools / quake3 / common / cmdlib.c

diff --git a/tools/quake3/common/cmdlib.c b/tools/quake3/common/cmdlib.c
index 5164001c04fae612b26de2758328c07e01fbfb03..103047c029eb85e2542c86d7d199bbdff6fc14ab 100644 (file)
--- a/tools/quake3/common/cmdlib.c
+++ b/tools/quake3/common/cmdlib.c
@@ -244,41 +244,14 @@ char *ExpandArg( const char *path ){
 
 char *ExpandPath( const char *path ){
        static char full[1024];
-       if ( !*qdir || path[0] == '/' || path[0] == '\\' || path[1] == ':' ) {
-               strcpy( full, path );
-               return full;
-       }
-       sprintf( full, "%s%s", qdir, path );
-       return full;
-}
-
-char *ExpandGamePath( const char *path ){
-       static char full[1024];
-       if ( !*gamedir ) {
-               Error( "ExpandGamePath called without gamedir set" );
-       }
        if ( path[0] == '/' || path[0] == '\\' || path[1] == ':' ) {
                strcpy( full, path );
                return full;
        }
-       sprintf( full, "%s%s", gamedir, path );
+       sprintf( full, "%s%s", qdir, path );
        return full;
 }
 
-char *ExpandPathAndArchive( const char *path ){
-       char    *expanded;
-       char archivename[1024];
-
-       expanded = ExpandPath( path );
-
-       if ( archive ) {
-               sprintf( archivename, "%s/%s", archivedir, path );
-               QCopyFile( expanded, archivename );
-       }
-       return expanded;
-}
-
-
 char *copystring( const char *s ){
        char    *b;
        b = safe_malloc( strlen( s ) + 1 );