Skip to content

M
magicseteditor
Commit 1fc52346 authored by coppro's avatar coppro
Browse files
Options

Fixed that stupid user-made keyword precedence bug.

parent 343c226f
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
src/script/functions/basic.cpp
View file @ 1fc52346
...@@ -328,10 +328,10 @@ SCRIPT_RULE_2_N_DEP(expand_keywords, ScriptValueP, _("default expand"), default_ ...@@ -328,10 +328,10 @@ SCRIPT_RULE_2_N_DEP(expand_keywords, ScriptValueP, _("default expand"), default_
SCRIPT_PARAM_C(Set*, set); SCRIPT_PARAM_C(Set*, set);
KeywordDatabase& db = set->keyword_db; KeywordDatabase& db = set->keyword_db;
if (db.empty()) { if (db.empty()) {
db.prepare_parameters(set->game->keyword_parameter_types, set->game->keywords);
db.prepare_parameters(set->game->keyword_parameter_types, set->keywords); db.prepare_parameters(set->game->keyword_parameter_types, set->keywords);
db.add(set->game->keywords); db.prepare_parameters(set->game->keyword_parameter_types, set->game->keywords);
db.add(set->keywords); db.add(set->keywords);
db.add(set->game->keywords);
} }
SCRIPT_OPTIONAL_PARAM_C_(CardP, card); SCRIPT_OPTIONAL_PARAM_C_(CardP, card);
WITH_DYNAMIC_ARG(keyword_usage_statistics, card ? &card->keyword_usage : nullptr); WITH_DYNAMIC_ARG(keyword_usage_statistics, card ? &card->keyword_usage : nullptr);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment