Skip to content

Y
YGOMobile-Cn-Ko-En
Commit a6d5e644 authored by fallenstardust's avatar fallenstardust
Browse files
Options

update showing alias 

补漏
parent 272fa4cd
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 4 deletions
Classes/gframe/event_handler.cpp
View file @ a6d5e644
...@@ -1455,6 +1455,8 @@ bool ClientField::OnEvent(const irr::SEvent& event) { ...@@ -1455,6 +1455,8 @@ bool ClientField::OnEvent(const irr::SEvent& event) {
mainGame->chain_when_avail = false; mainGame->chain_when_avail = false;
UpdateChainButtons(); UpdateChainButtons();
} }
if(mainGame->wSurrender->isVisible())
mainGame->HideElement(mainGame->wSurrender);
mainGame->wCmdMenu->setVisible(false); mainGame->wCmdMenu->setVisible(false);
if(mainGame->fadingList.size()) if(mainGame->fadingList.size())
break; break;
...@@ -1552,8 +1554,7 @@ bool ClientField::OnEvent(const irr::SEvent& event) { ...@@ -1552,8 +1554,7 @@ bool ClientField::OnEvent(const irr::SEvent& event) {
myswprintf(formatBuffer, L"%ls", dataManager.GetName(mcard->code)); myswprintf(formatBuffer, L"%ls", dataManager.GetName(mcard->code));
str.append(formatBuffer); str.append(formatBuffer);
if(mcard->type & TYPE_MONSTER) { if(mcard->type & TYPE_MONSTER) {
if(mcard->alias && (mcard->alias < mcard->code - 10 || mcard->alias > mcard->code + 10) if(mcard->alias && wcscmp(dataManager.GetName(mcard->code), dataManager.GetName(mcard->alias))) {
&& wcscmp(dataManager.GetName(mcard->code), dataManager.GetName(mcard->alias))) {
myswprintf(formatBuffer, L"\n(%ls)", dataManager.GetName(mcard->alias)); myswprintf(formatBuffer, L"\n(%ls)", dataManager.GetName(mcard->alias));
str.append(formatBuffer); str.append(formatBuffer);
} }
...@@ -1575,7 +1576,7 @@ bool ClientField::OnEvent(const irr::SEvent& event) { ...@@ -1575,7 +1576,7 @@ bool ClientField::OnEvent(const irr::SEvent& event) {
str.append(formatBuffer); str.append(formatBuffer);
} }
} else { } else {
if(mcard->alias && (mcard->alias < mcard->code - 10 || mcard->alias > mcard->code + 10)) { if(mcard->alias && wcscmp(dataManager.GetName(mcard->code), dataManager.GetName(mcard->alias))) {
myswprintf(formatBuffer, L"\n(%ls)", dataManager.GetName(mcard->alias)); myswprintf(formatBuffer, L"\n(%ls)", dataManager.GetName(mcard->alias));
str.append(formatBuffer); str.append(formatBuffer);
} }
...@@ -1866,7 +1867,6 @@ bool ClientField::OnCommonEvent(const irr::SEvent& event) { ...@@ -1866,7 +1867,6 @@ bool ClientField::OnCommonEvent(const irr::SEvent& event) {
int sel = mainGame->lstLog->getSelected(); int sel = mainGame->lstLog->getSelected();
if(sel != -1 && (int)mainGame->logParam.size() >= sel && mainGame->logParam[sel]) { if(sel != -1 && (int)mainGame->logParam.size() >= sel && mainGame->logParam[sel]) {
mainGame->wInfos->setActiveTab(0); mainGame->wInfos->setActiveTab(0);
mainGame->ShowCardInfo(mainGame->logParam[sel]);
} }
return true; return true;
break; break;
......
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