amy/MagicSetEditor2
1
0
Fork 0
mirror of https://github.com/amyinspace/MagicSetEditor2.git synced 2026-06-10 04:57:00 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fixed: include files where not read with the same ignore_invalid settings

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@1097 0fc631ac-6414-0410-93d0-97cfa31319b6
This commit is contained in:
twanvl
2008-08-08 13:55:59 +00:00
parent 8b01aa1823
commit 8389ed0c9a
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/util/io/reader.cpp
+2 -2
View File
@@ -25,9 +25,9 @@ Reader::Reader(const InputStreamP& input, Packaged* package, const String& filen
handleAppVersion();
}
Reader::Reader(Packaged* pkg, const String& filename)
Reader::Reader(Packaged* pkg, const String& filename, bool ignore_invalid)
: indent(0), expected_indent(0), state(OUTSIDE)
, ignore_invalid(false)
, ignore_invalid(ignore_invalid)
, filename(filename), package(pkg), line_number(0), previous_line_number(0)
, input(package_manager.openFileFromPackage(package, filename))
{
src/util/io/reader.hpp
+2 -2
View File
@@ -42,7 +42,7 @@ class Reader {
/** Used for "include file" keys.
* package can be nullptr
*/
Reader(Packaged* package, const String& filename);
Reader(Packaged* package, const String& filename, bool ignore_invalid = false);
~Reader() { showWarnings(); }
@@ -182,7 +182,7 @@ class Reader {
template <typename T>
void unknownKey(T& v) {
if (key == _("include file")) {
Reader reader(package, value);
Reader reader(package, value, ignore_invalid);
reader.handle_greedy(v);
moveNext();
} else {