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:
twanvl
2008-08-07 01:54:13 +00:00
parent 36065707ab
commit c6fe6634dd
12 changed files with 31 additions and 29 deletions
+1 -1
View File
@@ -183,7 +183,7 @@ void DropDownChoiceListBase::generateThumbnailImages() {
try {
String name = cannocial_name_form(field().choices->choiceName(i));
ctx.setVariable(_("input"), to_script(name));
GeneratedImageP img = image_from_script(style().image.getScript().eval(ctx));
GeneratedImageP img = image_from_script(style().image.getValidScriptP()->eval(ctx));
style().choice_images.insert(make_pair(name, ScriptableImage(img)));
} catch (const Error& e) {
handle_error(Error(e.what() + _("\n while generating choice images for drop down list")),true,false);