mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-02-03 13:45:34 +00:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'upstream/master'

Browse source
This commit is contained in:
Nikolay Kasyanov 2012-02-24 20:28:23 +04:00
commit 77368e6f05
8 changed files with 28 additions and 11 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() == '?')

4
components/files/configurationmanager.hpp
View file

@ -1,7 +1,11 @@
#ifndef COMPONENTS_FILES_CONFIGURATIONMANAGER_HPP
#define COMPONENTS_FILES_CONFIGURATIONMANAGER_HPP
#ifdef _WIN32
#include <boost/tr1/tr1/unordered_map>
#else
#include <tr1/unordered_map>
#endif
#include <boost/program_options.hpp>
#include <boost/filesystem.hpp>

2
components/files/fixedpath.hpp
View file

@ -30,7 +30,7 @@
#include <components/files/linuxpath.hpp>
namespace Files { typedef LinuxPath TargetPathType; }
#elif defined(__WIN32) || defined(__WINDOWS__)
#elif defined(__WIN32) || defined(__WINDOWS__) || defined(_WIN32)
#include <components/files/windowspath.hpp>
namespace Files { typedef WindowsPath TargetPathType; }

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
*/