Skip to content

Y
ygopro
Commit b76e3bff authored by mercury233's avatar mercury233 Committed by GitHub
Browse files
Options

fix announce list not refreshing (#2391)

parent 0221d32a
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 15 deletions
gframe/client_field.cpp
View file @ b76e3bff
...@@ -1526,21 +1526,8 @@ void ClientField::UpdateDeclarableList() { ...@@ -1526,21 +1526,8 @@ void ClientField::UpdateDeclarableList() {
return; return;
} }
if(pname[0] == 0) { if(pname[0] == 0) {
std::vector<int> cache;
cache.swap(ancard);
int sel = mainGame->lstANCard->getSelected(); int sel = mainGame->lstANCard->getSelected();
int selcode = (sel == -1) ? 0 : cache[sel]; trycode = (sel == -1) ? 0 : ancard[sel];
mainGame->lstANCard->clear();
for(const auto& trycode : cache) {
if(dataManager.GetString(trycode, &cstr) && dataManager.GetData(trycode, &cd) && is_declarable(cd, declare_opcodes)) {
ancard.push_back(trycode);
mainGame->lstANCard->addItem(cstr.name.c_str());
if(trycode == selcode)
mainGame->lstANCard->setSelected(cstr.name.c_str());
}
}
if(!ancard.empty())
return;
} }
mainGame->lstANCard->clear(); mainGame->lstANCard->clear();
ancard.clear(); ancard.clear();
...@@ -1549,7 +1536,7 @@ void ClientField::UpdateDeclarableList() { ...@@ -1549,7 +1536,7 @@ void ClientField::UpdateDeclarableList() {
auto cp = dataManager.GetCodePointer(cit->first); //verified by _strings auto cp = dataManager.GetCodePointer(cit->first); //verified by _strings
//datas.alias can be double card names or alias //datas.alias can be double card names or alias
if(is_declarable(cp->second, declare_opcodes)) { if(is_declarable(cp->second, declare_opcodes)) {
if(pname == cit->second.name) { //exact match if(pname == cit->second.name || trycode == cit->first) { //exact match or last used
mainGame->lstANCard->insertItem(0, cit->second.name.c_str(), -1); mainGame->lstANCard->insertItem(0, cit->second.name.c_str(), -1);
ancard.insert(ancard.begin(), cit->first); ancard.insert(ancard.begin(), cit->first);
} else { } else {
......
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