mirror of
https://github.com/amyinspace/MagicSetEditor2.git
synced 2026-06-10 04:57:00 -04:00
The 'Big Whine' patch:
Any use of a file from another package without a declared dependency will give a warning; Also added some more _LOCALE_123_ macros so we need less format_string calls git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@753 0fc631ac-6414-0410-93d0-97cfa31319b6
This commit is contained in:
@@ -14,9 +14,9 @@
|
||||
|
||||
// ----------------------------------------------------------------------------- : Reader
|
||||
|
||||
Reader::Reader(const InputStreamP& input, const String& filename, bool ignore_invalid)
|
||||
Reader::Reader(const InputStreamP& input, Packaged* package, const String& filename, bool ignore_invalid)
|
||||
: indent(0), expected_indent(0), state(OUTSIDE)
|
||||
, filename(filename), line_number(0), previous_line_number(0)
|
||||
, package(package), filename(filename), line_number(0), previous_line_number(0)
|
||||
, ignore_invalid(ignore_invalid)
|
||||
, input(input)
|
||||
{
|
||||
@@ -24,12 +24,12 @@ Reader::Reader(const InputStreamP& input, const String& filename, bool ignore_in
|
||||
handleAppVersion();
|
||||
}
|
||||
|
||||
Reader::Reader(const String& filename)
|
||||
Reader::Reader(Packaged* pkg, const String& filename)
|
||||
: indent(0), expected_indent(0), state(OUTSIDE)
|
||||
, filename(filename), line_number(0), previous_line_number(0)
|
||||
, package(pkg), filename(filename), line_number(0), previous_line_number(0)
|
||||
, ignore_invalid(false)
|
||||
, input(packages.openFileFromPackage(filename))
|
||||
{
|
||||
input = packages.openFileFromPackage(package, filename);
|
||||
moveNext();
|
||||
handleAppVersion();
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user