games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-11-23 22:37:55 +02:00
Code Issues Releases Activity

Merge branch 'Zyx-develop' into develop

Browse Source 
Conflicts:
	lib/filesystem/AdapterLoaders.h
This commit is contained in:
AlexVinS
2016-01-27 18:53:41 +03:00
parent 3c84400262 bffdc2813d
commit d7c0c3759a
36 changed files with 496 additions and 171 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/filesystem/ISimpleResourceLoader.h
View File

@@ -48,9 +48,9 @@ public:
*
* @return path or empty optional if file can't be accessed independently (e.g. file in archive)
*/
virtual boost::optional<std::string> getResourceName(const ResourceID & resourceName) const
virtual boost::optional<boost::filesystem::path> getResourceName(const ResourceID & resourceName) const
{
return boost::optional<std::string>();
return boost::optional<boost::filesystem::path>();
}
/**