mirror of
https://github.com/amyinspace/MagicSetEditor2.git
synced 2026-06-11 05:07:00 -04:00
Tweaked the way to use getScript() like functions;
Made condition and default_expand parameters of expand_keywords optional. git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@1080 0fc631ac-6414-0410-93d0-97cfa31319b6
This commit is contained in:
@@ -670,7 +670,7 @@ bool KeywordDatabase::tryExpand(const Keyword& kw,
|
||||
bool expand = expand_type == _('1');
|
||||
if (!expand && expand_type != _('0')) {
|
||||
// default expand, determined by script
|
||||
expand = expand_default && (bool)*expand_default->eval(ctx);
|
||||
expand = expand_default ? (bool)*expand_default->eval(ctx) : true;
|
||||
expand_type = expand ? _('A') : _('a');
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user