cmake/radiant: FHS fixes

[xonotic/netradiant.git] / radiant / qe3.cpp

diff --git a/radiant/qe3.cpp b/radiant/qe3.cpp
index 5360a0ab28368b41b0661d2b303c2198a053c148..38028e7dd5918d087aea2d0b8ea2dc44dc26df00 100644 (file)
--- a/radiant/qe3.cpp
+++ b/radiant/qe3.cpp
@@ -32,6 +32,7 @@
 // Leonardo Zide (leo@lokigames.com)
 //
 
+#include "defaults.h"
 #include "qe3.h"
 #include "globaldefs.h"
 
@@ -83,17 +84,22 @@ void QE_InitVFS(){
        const char* userRoot = g_qeglobals.m_userEnginePath.c_str();
        const char* globalRoot = EnginePath_get();
 
+       // editor builtin VFS
+       StringOutputStream editorGamePath( 256 );
+       editorGamePath << GlobalRadiant().getDataPath() << DEFAULT_EDITORVFS_DIRNAME;
+       GlobalFileSystem().initDirectory( editorGamePath.c_str() );
+
        // if we have a mod dir
        if ( !string_equal( gamename, basegame ) ) {
                // ~/.<gameprefix>/<fs_game>
-               if ( userRoot ) {
+               if ( userRoot && !g_disableHomePath ) {
                        StringOutputStream userGamePath( 256 );
                        userGamePath << userRoot << gamename << '/';
                        GlobalFileSystem().initDirectory( userGamePath.c_str() );
                }
 
                // <fs_basepath>/<fs_game>
-               {
+               if ( !g_disableEnginePath ) {
                        StringOutputStream globalGamePath( 256 );
                        globalGamePath << globalRoot << gamename << '/';
                        GlobalFileSystem().initDirectory( globalGamePath.c_str() );
@@ -101,14 +107,14 @@ void QE_InitVFS(){
        }
 
        // ~/.<gameprefix>/<fs_main>
-       if ( userRoot ) {
+       if ( userRoot && !g_disableHomePath ) {
                StringOutputStream userBasePath( 256 );
                userBasePath << userRoot << basegame << '/';
                GlobalFileSystem().initDirectory( userBasePath.c_str() );
        }
 
        // <fs_basepath>/<fs_main>
-       {
+       if ( !g_disableEnginePath ) {
                StringOutputStream globalBasePath( 256 );
                globalBasePath << globalRoot << basegame << '/';
                GlobalFileSystem().initDirectory( globalBasePath.c_str() );
@@ -168,7 +174,11 @@ bool ConfirmModified( const char* title ){
 
 void bsp_init(){
        build_set_variable( "RadiantPath", AppPath_get() );
+
+       #if GDEF_OS_WINDOWS
        build_set_variable( "ExecutableType", RADIANT_EXECUTABLE );
+       #endif // GDEF_OS_WINDOWS
+
        build_set_variable( "EnginePath", EnginePath_get() );
        build_set_variable( "UserEnginePath", g_qeglobals.m_userEnginePath.c_str() );
        build_set_variable( "MonitorAddress", ( g_WatchBSP_Enabled ) ? "127.0.0.1:39000" : "" );
@@ -183,6 +193,16 @@ void bsp_init(){
                        ExtraQ3map2Args.push_string( "\"" );
                }
        }
+
+       // extra switches
+       if ( g_disableEnginePath ) {
+               ExtraQ3map2Args.push_string( " -fs_nobasepath " );
+       }
+
+       if ( g_disableHomePath ) {
+               ExtraQ3map2Args.push_string( " -fs_nohomepath " );
+       }
+
        build_set_variable( "ExtraQ3map2Args", ExtraQ3map2Args.c_str() );
 
        const char* mapname = Map_Name( g_map );
@@ -204,6 +224,7 @@ public:
 ArrayCommandListener(){
        m_array = g_ptr_array_new();
 }
+
 ~ArrayCommandListener(){
        g_ptr_array_free( m_array, TRUE );
 }