teamnwah/openmw-tes3coop
2
0
Fork 1
forked from mirror/openmw-tes3mp
Code Issues Pull requests 1 Releases Wiki Activity

Merge remote branch 'lgro/config_fixes'

Browse source
This commit is contained in:
Marc Zinnschlag 2012-02-24 09:03:48 +01:00
commit 728e9cce5a
6 changed files with 23 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
components/files/configurationmanager.cpp
View file

@ -6,6 +6,7 @@
#include <algorithm>
#include <boost/bind.hpp>
#include <boost/algorithm/string/erase.hpp>
/**
* \namespace Files
@ -69,9 +70,11 @@ void ConfigurationManager::readConfiguration(boost::program_options::variables_m
void ConfigurationManager::processPaths(Files::PathContainer& dataDirs)
{
std::string path;
for (Files::PathContainer::iterator it = dataDirs.begin(); it != dataDirs.end(); ++it)
{
const std::string& path = it->string();
path = it->string();
boost::erase_all(path, "\"");
// Check if path contains a token
if (!path.empty() && *path.begin() == '?')

9
components/files/linuxpath.cpp
View file

@ -105,11 +105,16 @@ boost::filesystem::path LinuxPath::getInstallPath() const
std::string line;
std::string mwpath;
while (std::getline(file, line) && !line.empty())
while (std::getline(file, line))
{
if (line[0] == '[') // we found an entry
{
isRegEntry = (line.find("Softworks\\Morrowind]") != std::string::npos);
if (isRegEntry)
{
break;
}
isRegEntry = (line.find("Softworks\\\\Morrowind]") != std::string::npos);
}
else if (isRegEntry)
{

2
components/files/linuxpath.hpp
View file

@ -46,7 +46,7 @@ struct LinuxPath
boost::filesystem::path getUserPath() const;
/**
* \brief Return path to the global (system) configuration directory.
* \brief Return path to the global (system) directory where game files could be placed.
*
* \return boost::filesystem::path
*/

9
components/files/macospath.cpp
View file

@ -105,11 +105,16 @@ boost::filesystem::path MacOsPath::getInstallPath() const
std::string line;
std::string mwpath;
while (std::getline(file, line) && !line.empty())
while (std::getline(file, line))
{
if (line[0] == '[') // we found an entry
{
isRegEntry = (line.find("Softworks\\Morrowind]") != std::string::npos);
if (isRegEntry)
{
break;
}
isRegEntry = (line.find("Softworks\\\\Morrowind]") != std::string::npos);
}
else if (isRegEntry)
{

6
components/files/macospath.hpp
View file

@ -39,21 +39,21 @@ namespace Files
struct MacOsPath
{
/**
* \brief Return path to the local configuration directory.
* \brief Return path to the local directory.
*
* \return boost::filesystem::path
*/
boost::filesystem::path getUserPath() const;
/**
* \brief Return path to the global (system) configuration directory.
* \brief Return path to the global (system) directory.
*
* \return boost::filesystem::path
*/
boost::filesystem::path getGlobalPath() const;
/**
* \brief Return path to the runtime configuration directory which is the
* \brief Return path to the runtime directory which is the
* place where an application was started.
*
* \return boost::filesystem::path

2
components/files/windowspath.hpp
View file

@ -62,7 +62,7 @@ struct WindowsPath
boost::filesystem::path getLocalPath() const;
/**
* \brief Return same path like getGlobalConfigPath
* \brief Return same path like getGlobalPath
*
* \return boost::filesystem::path
*/