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

always call the combine function when expanding keywords

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@1358 0fc631ac-6414-0410-93d0-97cfa31319b6
This commit is contained in:
twanvl
2009-01-15 22:10:58 +00:00
parent 8dd4b207b1
commit f24806a4de
1 changed files with 11 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/data/keyword.cpp
+11 -16
View File
@@ -686,23 +686,18 @@ bool KeywordDatabase::tryExpand(const Keyword& kw,
result += remove_tag(tagged.substr(0, start), _("<kw-")); result += remove_tag(tagged.substr(0, start), _("<kw-"));
// Combine keyword & reminder with result // Combine keyword & reminder with result
if (expand) { String reminder;
String reminder; try {
try { reminder = kw.reminder.invoke(ctx)->toString();
reminder = kw.reminder.invoke(ctx)->toString(); } catch (const Error& e) {
} catch (const Error& e) { handle_error(_ERROR_2_("in keyword reminder", e.what(), kw.keyword), true, false);
handle_error(_ERROR_2_("in keyword reminder", e.what(), kw.keyword), true, false);
}
ctx.setVariable(_("keyword"), to_script(total));
ctx.setVariable(_("reminder"), to_script(reminder));
result += _("<kw-"); result += expand_type; result += _(">");
result += combine_script->eval(ctx)->toString();
result += _("</kw-"); result += expand_type; result += _(">");
} else {
result += _("<kw-"); result += expand_type; result += _(">");
result += total;
result += _("</kw-"); result += expand_type; result += _(">");
} }
ctx.setVariable(_("keyword"), to_script(total));
ctx.setVariable(_("reminder"), to_script(reminder));
ctx.setVariable(_("expand"), to_script(expand));
result += _("<kw-"); result += expand_type; result += _(">");
result += combine_script->eval(ctx)->toString();
result += _("</kw-"); result += expand_type; result += _(">");
// Add to usage statistics // Add to usage statistics
if (stat && stat_key) { if (stat && stat_key) {