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

keywords from the set file take precedence over keywords from the game file

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@1344 0fc631ac-6414-0410-93d0-97cfa31319b6
This commit is contained in:
twanvl
2009-01-11 02:17:31 +00:00
parent 1ae654082d
commit eaf5e9bef2
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/data/keyword.cpp
+9 -4
View File
@@ -483,10 +483,15 @@ String KeywordDatabase::expand(const String& text,
next.resize(0); next.resize(0);
closure(current); closure(current);
// are we done? // are we done?
FOR_EACH(n, current) { for (int set_or_game = 0 ; set_or_game <= 1 ; ++set_or_game) {
FOR_EACH(f, n->finished) { FOR_EACH(n, current) {
const Keyword* kw = f; FOR_EACH(kw, n->finished) {
if (used.insert(kw).second) { if (kw->fixed != (bool)set_or_game) {
continue; // first try set keywords, try game keywords in the second round
}
if (!used.insert(kw).second) {
continue; // already seen this keyword
}
// we have found a possible match, for a keyword which we have not seen before // we have found a possible match, for a keyword which we have not seen before
if (tryExpand(*kw, i, tagged, untagged, result, expand_type, if (tryExpand(*kw, i, tagged, untagged, result, expand_type,
match_condition, expand_default, combine_script, ctx, match_condition, expand_default, combine_script, ctx,