From 0b1f18cc12211e74a48b81e7ee0be1563c2bdf3f Mon Sep 17 00:00:00 2001 From: Jan-Peter Nilsson Date: Tue, 4 Jan 2011 20:33:22 +0100 Subject: [PATCH] plugins.cfg is global config --- apps/openmw/engine.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/apps/openmw/engine.cpp b/apps/openmw/engine.cpp index 31f59a420..5c26a0a82 100644 --- a/apps/openmw/engine.cpp +++ b/apps/openmw/engine.cpp @@ -307,13 +307,14 @@ void OMW::Engine::go() std::cout << "Data directory: " << mDataDir << "\n"; - std::string cfgDir = OMW::Path::getPath(OMW::Path::USER_CFG_PATH, "openmw", ""); + std::string cfgDir = OMW::Path::getPath(OMW::Path::GLOBAL_CFG_PATH, "openmw", ""); + std::string cfgUserDir = OMW::Path::getPath(OMW::Path::USER_CFG_PATH, "openmw", ""); std::string plugCfg = "plugins.cfg"; std::string ogreCfg = "ogre.cfg"; - ogreCfg.insert(0, cfgDir); + ogreCfg.insert(0, cfgUserDir); plugCfg.insert(0, cfgDir); - mOgre.configure(!isFile(ogreCfg.c_str()), cfgDir, plugCfg, false); + mOgre.configure(!isFile(ogreCfg.c_str()), cfgUserDir, plugCfg, false); addResourcesDirectory (mDataDir / "Meshes"); addResourcesDirectory (mDataDir / "Textures");