mirror of
https://github.com/vcmi/vcmi.git
synced 2024-12-24 22:14:36 +02:00
- compile fixes
- filesystem tweaks
This commit is contained in:
parent
55f321f3f3
commit
28f0263298
1
Global.h
1
Global.h
@ -75,6 +75,7 @@
|
||||
#include <boost/range/algorithm.hpp>
|
||||
#include <boost/thread.hpp>
|
||||
#include <boost/unordered_set.hpp>
|
||||
#include <boost/unordered_map.hpp>
|
||||
#include <boost/variant.hpp>
|
||||
|
||||
#ifdef ANDROID
|
||||
|
@ -27,7 +27,7 @@
|
||||
{"type" : "file", "path" : "ALL/Data/Heroes3-cd2.snd"},
|
||||
{"type" : "file", "path" : "ALL/Data/Heroes3.snd"},
|
||||
//WoG have overriden sounds with .82m extension in Data
|
||||
{"type" : "dir", "path" : "ALL/Data"}
|
||||
{"type" : "dir", "path" : "ALL/Data", "depth": 0}
|
||||
],
|
||||
"MUSIC/":
|
||||
[
|
||||
@ -36,7 +36,7 @@
|
||||
"VIDEO/":
|
||||
[
|
||||
{"type" : "file", "path" : "ALL/Data/H3ab_ahd.vid"},
|
||||
{"type" : "file", "path" : "ALL/Data/H3ab_ahd.vid"},
|
||||
{"type" : "file", "path" : "ALL/Data/video.vid"},
|
||||
// Location of video files in linux release
|
||||
{"type" : "dir", "path" : "ALL/Data/Video"}
|
||||
],
|
||||
|
@ -80,6 +80,14 @@ public:
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
* Copy Ctor. Required by clang (or this is standard?) if move constructor is present
|
||||
*/
|
||||
ResourceID(const ResourceID & other)
|
||||
: name(other.getName()), type(other.getType())
|
||||
{
|
||||
}
|
||||
|
||||
/**
|
||||
* Ctor. Can be used to create indentifier for resource loading using one parameter
|
||||
*
|
||||
|
Loading…
Reference in New Issue
Block a user