diff options
| author | Andrei Karas <akaras@inbox.ru> | 2014-02-15 17:01:46 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2014-02-15 17:01:46 +0300 |
| commit | 382067b05c4fe97bcf0da0143405375ec295f7c6 (patch) | |
| tree | f668cd2595ac0c85f0942f88729d3ff1956676fa /src/resources/beingcommon.cpp | |
| parent | ee8191705826d978b7793497fdd307536c709bff (diff) | |
| parent | 9b329556e748050c4300174e9bdc72b15e5b8cc5 (diff) | |
| download | plus-382067b05c4fe97bcf0da0143405375ec295f7c6.tar.gz plus-382067b05c4fe97bcf0da0143405375ec295f7c6.tar.bz2 plus-382067b05c4fe97bcf0da0143405375ec295f7c6.tar.xz plus-382067b05c4fe97bcf0da0143405375ec295f7c6.zip | |
Merge branch 'master' into stable
Diffstat (limited to 'src/resources/beingcommon.cpp')
| -rw-r--r-- | src/resources/beingcommon.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/resources/beingcommon.cpp b/src/resources/beingcommon.cpp index 7b7a57d9e..388312b34 100644 --- a/src/resources/beingcommon.cpp +++ b/src/resources/beingcommon.cpp @@ -49,7 +49,9 @@ void BeingCommon::readBasicAttributes(BeingInfo *const info, info->setHpBarOffsetY(XML::getProperty(node, "hpBarOffsetY", 0)); } -void BeingCommon::getIncludeFiles(const std::string &dir, StringVect &list) +void BeingCommon::getIncludeFiles(const std::string &dir, + StringVect &list, + const std::string &ext) { const std::string path = dir + "/"; StringVect tempList; @@ -57,7 +59,7 @@ void BeingCommon::getIncludeFiles(const std::string &dir, StringVect &list) FOR_EACH (StringVectCIter, it, tempList) { const std::string &str = *it; - if (findLast(str, ".xml")) + if (findLast(str, ext)) list.push_back(str); } std::sort(list.begin(), list.end()); |