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

log file loading

Browse Source
This commit is contained in:
Henning Koehler 2017-08-27 12:59:09 +12:00
parent fc77c40a82
commit 06d2507371
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
config/skills.json
View File

@ -371,7 +371,7 @@
}, },
"estates" : { "estates" : {
"basic" : { "basic" : {
"description" : "", "description" : "With Basic Estates, a hero contributes 125 gold per day to your cause.",
"effects" : [ "effects" : [
{ {
"subtype" : "skill.estates", "subtype" : "skill.estates",
@ -382,7 +382,7 @@
] ]
}, },
"advanced" : { "advanced" : {
"description" : "", "description" : "With Advanced Estates, a hero contributes 250 gold per day to your cause.",
"effects" : [ "effects" : [
{ {
"subtype" : "skill.estates", "subtype" : "skill.estates",
@ -393,7 +393,7 @@
] ]
}, },
"expert" : { "expert" : {
"description" : "", "description" : "With Expert Estates, a hero contributes 500 gold per day to your cause.",
"effects" : [ "effects" : [
{ {
"subtype" : "skill.estates", "subtype" : "skill.estates",

5
lib/filesystem/CFilesystemLoader.cpp
View File

@ -26,8 +26,9 @@ CFilesystemLoader::CFilesystemLoader(std::string _mountPoint, bfs::path baseDire
std::unique_ptr<CInputStream> CFilesystemLoader::load(const ResourceID & resourceName) const std::unique_ptr<CInputStream> CFilesystemLoader::load(const ResourceID & resourceName) const
{ {
assert(fileList.count(resourceName)); assert(fileList.count(resourceName));
boost::filesystem::path file = baseDirectory / fileList.at(resourceName);
return make_unique<CFileInputStream>(baseDirectory / fileList.at(resourceName)); logGlobal->trace("loading %s", file.string());
return make_unique<CFileInputStream>(file);
} }
bool CFilesystemLoader::existsResource(const ResourceID & resourceName) const bool CFilesystemLoader::existsResource(const ResourceID & resourceName) const