Commit 8748593c authored by salix5's avatar salix5

field::solve_continuous(), card search

Now $card_name will only search the card name.
parent 4466b87c
...@@ -649,7 +649,7 @@ void DeckBuilder::FilterCards() { ...@@ -649,7 +649,7 @@ void DeckBuilder::FilterCards() {
myswprintf(result_string, L"%d", results.size()); myswprintf(result_string, L"%d", results.size());
return; return;
} }
if(pstr[0] == 0) if(pstr[0] == 0 || (pstr[0] == L'$' and pstr[1] == 0))
pstr = 0; pstr = 0;
auto strpointer = dataManager._strings.begin(); auto strpointer = dataManager._strings.begin();
for(code_pointer ptr = dataManager._datas.begin(); ptr != dataManager._datas.end(); ++ptr, ++strpointer) { for(code_pointer ptr = dataManager._datas.begin(); ptr != dataManager._datas.end(); ++ptr, ++strpointer) {
...@@ -712,9 +712,15 @@ void DeckBuilder::FilterCards() { ...@@ -712,9 +712,15 @@ void DeckBuilder::FilterCards() {
continue; continue;
} }
if(pstr) { if(pstr) {
if(pstr[0] == L'$') {
if(wcsstr(text.name, &pstr[1]) == 0)
continue;
}
else {
if(wcsstr(text.name, pstr) == 0 && wcsstr(text.text, pstr) == 0) if(wcsstr(text.name, pstr) == 0 && wcsstr(text.text, pstr) == 0)
continue; continue;
} }
}
results.push_back(ptr); results.push_back(ptr);
} }
myswprintf(result_string, L"%d", results.size()); myswprintf(result_string, L"%d", results.size());
......
...@@ -4583,6 +4583,7 @@ int32 field::solve_continuous(uint16 step, effect * peffect, uint8 triggering_pl ...@@ -4583,6 +4583,7 @@ int32 field::solve_continuous(uint16 step, effect * peffect, uint8 triggering_pl
} }
core.continuous_chain.pop_back(); core.continuous_chain.pop_back();
core.solving_event.pop_front(); core.solving_event.pop_front();
adjust_all();
return TRUE; return TRUE;
} }
} }
......
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