libdoomsday|Client: Runtime path is managed by de::App, not libdoomsday

doomsday/apps/client/src/dd_main.cpp

@@ -507,7 +507,7 @@ void App_Error(char const *error, ...)
     errorInProgress = true;
 
     // Get back to the directory we started from.
-    Dir_SetCurrent(DD_RuntimePath());
+    //Dir_SetCurrent(DD_RuntimePath());
 
     va_start(argptr, error);
     dd_vsnprintf(err, sizeof(err), error, argptr);
@@ -1246,10 +1246,10 @@ static dint DD_StartupWorker(void * /*context*/)
     //Con_SetProgress(20);
 
     // Was the change to userdir OK?
-    if(CommandLine_CheckWith("-userdir", 1) && !DoomsdayApp::app().isUsingUserDir())
+    /*if(CommandLine_CheckWith("-userdir", 1) && !DoomsdayApp::app().isUsingUserDir())
     {
         LOG_WARNING("User directory not found (check -userdir)");
-    }
+    }*/
 
     FS_InitVirtualPathMappings();
     App_FileSystem().resetAllSchemes();

doomsday/apps/libdoomsday/include/doomsday/doomsdayapp.h

@@ -103,7 +103,7 @@ class LIBDOOMSDAY_PUBLIC DoomsdayApp
                     std::function<int (void *)> gameActivationFunc,
                     Behaviors behaviors = DefaultBehavior);
 
-    bool isUsingUserDir() const;
+    //bool isUsingUserDir() const;
 
     bool isShuttingDown() const;
     void setShuttingDown(bool shuttingDown);
@@ -113,9 +113,9 @@ class LIBDOOMSDAY_PUBLIC DoomsdayApp
 #endif
 
     void setDoomsdayBasePath(de::NativePath const &path);
-    void setDoomsdayRuntimePath(de::NativePath const &path);
+    //void setDoomsdayRuntimePath(de::NativePath const &path);
     std::string const &doomsdayBasePath() const;
-    std::string const &doomsdayRuntimePath() const;
+    //std::string const &doomsdayRuntimePath() const;
 
 public:
     static DoomsdayApp &app();

doomsday/apps/libdoomsday/include/doomsday/paths.h

@@ -27,11 +27,11 @@ extern "C" {
 
 LIBDOOMSDAY_PUBLIC char const *DD_BasePath();
 
-LIBDOOMSDAY_PUBLIC char const *DD_RuntimePath();
+//LIBDOOMSDAY_PUBLIC char const *DD_RuntimePath();
 
 LIBDOOMSDAY_PUBLIC void DD_SetBasePath(char const *path);
 
-LIBDOOMSDAY_PUBLIC void DD_SetRuntimePath(char const *path);
+//LIBDOOMSDAY_PUBLIC void DD_SetRuntimePath(char const *path);
 
 #ifdef __cplusplus
 } // extern "C"

doomsday/apps/libdoomsday/src/doomsdayapp.cpp

@@ -66,7 +66,7 @@ static DoomsdayApp *theDoomsdayApp = nullptr;
 DENG2_PIMPL(DoomsdayApp)
 {
     std::string ddBasePath; // Doomsday root directory is at...?
-    std::string ddRuntimePath;
+    //std::string ddRuntimePath;
 
     bool initialized = false;
     bool shuttingDown = false;
@@ -78,15 +78,15 @@ DENG2_PIMPL(DoomsdayApp)
     Players players;
     res::Bundles dataBundles;
 
-    /// @c true = We are using a custom user dir specified on the command line.
-    bool usingUserDir = false;
+    // @c true = We are using a custom user dir specified on the command line.
+    //bool usingUserDir = false;
 
-#ifdef UNIX
+/*#ifdef UNIX
 # ifndef MACOSX
     /// @c true = We are using the user dir defined in the HOME environment.
     bool usingHomeDir = false;
 # endif
-#endif
+#endif*/
 
 #ifdef WIN32
     HINSTANCE hInstance = NULL;
@@ -253,6 +253,7 @@ DENG2_PIMPL(DoomsdayApp)
         // By default, make sure the working path is the home folder.
         App::setCurrentWorkPath(App::app().nativeHomePath());
 
+        /*
 # ifndef MACOSX
         if(getenv("HOME"))
         {
@@ -270,7 +271,8 @@ DENG2_PIMPL(DoomsdayApp)
             Dir_Delete(temp);
         }
 # endif
-
+        */
+/*
         // The -userdir option sets the working directory.
         if(CommandLine_CheckWith("-userdir", 1))
         {
@@ -304,7 +306,7 @@ DENG2_PIMPL(DoomsdayApp)
             directory_t* temp = Dir_NewFromCWD();
             DD_SetRuntimePath(Dir_Path(temp));
             Dir_Delete(temp);
-        }
+        }*/
 
         // libcore has determined the native base path, so let FS1 know about it.
         DD_SetBasePath(DENG2_APP->nativeBasePath().toUtf8());
@@ -314,6 +316,7 @@ DENG2_PIMPL(DoomsdayApp)
 #ifdef WIN32
     void determineGlobalPaths()
     {
+        /*
         // Change to a custom working directory?
         if(CommandLine_CheckWith("-userdir", 1))
         {
@@ -326,6 +329,7 @@ DENG2_PIMPL(DoomsdayApp)
 
         // The runtime directory is the current working directory.
         DD_SetRuntimePath((NativePath::workPath().withSeparators('/') + '/').toUtf8().constData());
+        */
 
         // Use a custom base directory?
         if(CommandLine_CheckWith("-basedir", 1))
@@ -470,10 +474,10 @@ NativePath DoomsdayApp::steamBasePath()
     return "";
 }
 
-bool DoomsdayApp::isUsingUserDir() const
+/*bool DoomsdayApp::isUsingUserDir() const
 {
     return d->usingUserDir;
-}
+}*/
 
 bool DoomsdayApp::isShuttingDown() const
 {
@@ -506,15 +510,15 @@ void DoomsdayApp::setDoomsdayBasePath(NativePath const &path)
     d->ddBasePath = temp;
 }
 
-std::string const &DoomsdayApp::doomsdayRuntimePath() const
+/*std::string const &DoomsdayApp::doomsdayRuntimePath() const
 {
     return d->ddRuntimePath;
 }
 
 void DoomsdayApp::setDoomsdayRuntimePath(NativePath const &path)
 {
     d->ddRuntimePath = path.toUtf8().constData();
-}
+}*/
 
 #ifdef WIN32
 void *DoomsdayApp::moduleHandle() const

doomsday/apps/libdoomsday/src/paths.cpp

@@ -24,17 +24,17 @@ char const *DD_BasePath()
     return DoomsdayApp::app().doomsdayBasePath().c_str();
 }
 
-char const *DD_RuntimePath()
+/*char const *DD_RuntimePath()
 {
     return DoomsdayApp::app().doomsdayRuntimePath().c_str();
-}
+}*/
 
 void DD_SetBasePath(char const *path)
 {
     DoomsdayApp::app().setDoomsdayBasePath(path);
 }
 
-void DD_SetRuntimePath(char const *path)
+/*void DD_SetRuntimePath(char const *path)
 {
     DoomsdayApp::app().setDoomsdayRuntimePath(path);
-}
+}*/