games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2024-12-24 22:14:36 +02:00
Code Issues Releases Activity

Fix build.

Browse Source
This commit is contained in:
AlexVinS 2016-01-27 19:32:59 +03:00
parent d7c0c3759a
commit 048e22dbe6
4 changed files with 91 additions and 91 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/CModHandler.cpp
View File

@ -554,7 +554,7 @@ void CModHandler::loadConfigFromFile (std::string name)
std::string paths;
for(auto& p : CResourceHandler::get()->getResourceNames(ResourceID("config/" + name)))
{
paths += p + ", ";
paths += p.string() + ", ";
}
paths = paths.substr(0, paths.size() - 2);
logGlobal->debugStream() << "Loading hardcoded features settings from [" << paths << "], result:";

4
lib/filesystem/AdapterLoaders.cpp
View File

@ -87,9 +87,9 @@ boost::optional<boost::filesystem::path> CFilesystemList::getResourceName(const
return boost::optional<boost::filesystem::path>();
}
std::set<std::string> CFilesystemList::getResourceNames(const ResourceID & resourceName) const
std::set<boost::filesystem::path> CFilesystemList::getResourceNames(const ResourceID & resourceName) const
{
std::set<std::string> paths;
std::set<boost::filesystem::path> paths;
for(auto& loader : getResourcesWithName(resourceName))
{
auto rn = loader->getResourceName(resourceName);

2
lib/filesystem/AdapterLoaders.h
View File

@ -71,7 +71,7 @@ public:
bool existsResource(const ResourceID & resourceName) const override;
std::string getMountPoint() const override;
boost::optional<boost::filesystem::path> getResourceName(const ResourceID & resourceName) const override;
std::set<std::string> getResourceNames(const ResourceID & resourceName) const override;
std::set<boost::filesystem::path> getResourceNames(const ResourceID & resourceName) const override;
std::unordered_set<ResourceID> getFilteredFiles(std::function<bool(const ResourceID &)> filter) const override;
bool createResource(std::string filename, bool update = false) override;
std::vector<const ISimpleResourceLoader *> getResourcesWithName(const ResourceID & resourceName) const override;

4
lib/filesystem/ISimpleResourceLoader.h
View File

@ -58,9 +58,9 @@ public:
*
* @return std::set with names.
*/
virtual std::set<std::string> getResourceNames(const ResourceID & resourceName) const
virtual std::set<boost::filesystem::path> getResourceNames(const ResourceID & resourceName) const
{
std::set<std::string> result;
std::set<boost::filesystem::path> result;
auto rn = getResourceName(resourceName);
if(rn)
{