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

Make it build again (but remove the new functionality).

Browse source
This commit is contained in:
AnyOldName3 2016-07-20 15:16:53 +01:00
parent d9d5a6561b
commit 59639e3988
2 changed files with 18 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/openmw/main.cpp
View file

@ -193,7 +193,7 @@ bool parseOptions (int argc, char** argv, OMW::Engine& engine, Files::Configurat
// directory settings
engine.enableFSStrict(variables["fs-strict"].as<bool>());
Files::PathContainer dataDirs(variables["data"].as<Files::EscapePathContainer>().mContainer);
Files::PathContainer dataDirs(Files::EscapePath::toPathContainer(variables["data"].as<Files::EscapePathContainer>()));
std::string local(variables["data-local"].as<Files::EscapeHashString>().toStdString());
if (!local.empty())

24
components/fallback/validate.hpp
View file

@ -70,21 +70,31 @@ namespace Files {
eSV->mVector.push_back(EscapeHashString(*it));
}
struct EscapePathContainer {
PathContainer mContainer;
struct EscapePath {
boost::filesystem::path mPath;
static PathContainer toPathContainer(const std::vector<EscapePath> & escapePathContainer);
};
std::istream & operator>> (std::istream & istream, EscapePathContainer & escapePathContainer)
typedef std::vector<EscapePath> EscapePathContainer;
PathContainer EscapePath::toPathContainer(const EscapePathContainer & escapePathContainer)
{
PathContainer temp;
for (EscapePathContainer::const_iterator it = escapePathContainer.begin(); it != escapePathContainer.end(); ++it)
temp.push_back(it->mPath);
return temp;
}
std::istream & operator>> (std::istream & istream, EscapePath & escapePath)
{
std::cout << "The new dodgy operator>> is being used" << std::endl;
boost::iostreams::filtering_istream filteredStream;
filteredStream.push(unescape_hash_filter());
//filteredStream.push(unescape_hash_filter());
filteredStream.push(istream);
boost::filesystem::path path;
filteredStream >> path;
escapePathContainer.mContainer.push_back(path);
filteredStream >> escapePath.mPath;
return istream;
}