Skip to content

Y
YGOMobile
Commit c3f48cc4 authored by fallenstardust's avatar fallenstardust
Browse files
Options

fix MSG_SORT_CARD

parent 53d1ca5a
Hide whitespace changes
Inline Side-by-side
Showing with 7 additions and 4 deletions
Classes/gframe/client_field.cpp
View file @ c3f48cc4
...@@ -516,11 +516,13 @@ void ClientField::ShowChainCard() { ...@@ -516,11 +516,13 @@ void ClientField::ShowChainCard() {
mainGame->stCardPos[i]->setOverrideColor(0xff0000ff); mainGame->stCardPos[i]->setOverrideColor(0xff0000ff);
if(selectable_cards[i]->overlayTarget->controler) if(selectable_cards[i]->overlayTarget->controler)
mainGame->stCardPos[i]->setBackgroundColor(0xff5a5a5a); mainGame->stCardPos[i]->setBackgroundColor(0xff5a5a5a);
else mainGame->stCardPos[i]->setBackgroundColor(0xff56649f); else
mainGame->stCardPos[i]->setBackgroundColor(0xff56649f);
} else { } else {
if(selectable_cards[i]->controler) if(selectable_cards[i]->controler)
mainGame->stCardPos[i]->setBackgroundColor(0xff5a5a5a); mainGame->stCardPos[i]->setBackgroundColor(0xff5a5a5a);
else mainGame->stCardPos[i]->setBackgroundColor(0xff56649f); else
mainGame->stCardPos[i]->setBackgroundColor(0xff56649f);
} }
mainGame->stCardPos[i]->setVisible(true); mainGame->stCardPos[i]->setVisible(true);
mainGame->stCardPos[i]->setRelativePosition(rect<s32>((startpos + i * 125) * mainGame->xScale, 40 * mainGame->yScale, (startpos + 120 + i * 125) * mainGame->xScale, 60 * mainGame->yScale)); mainGame->stCardPos[i]->setRelativePosition(rect<s32>((startpos + i * 125) * mainGame->xScale, 40 * mainGame->yScale, (startpos + 120 + i * 125) * mainGame->xScale, 60 * mainGame->yScale));
......
Classes/gframe/event_handler.cpp
View file @ c3f48cc4
...@@ -951,8 +951,8 @@ bool ClientField::OnEvent(const irr::SEvent& event) { ...@@ -951,8 +951,8 @@ bool ClientField::OnEvent(const irr::SEvent& event) {
mainGame->btnCardSelect[i]->setRelativePosition(rect<s32>((30 + i * 125) * mainGame->xScale, 65 * mainGame->yScale, (30 + 120 + i * 125) * mainGame->xScale, 235 * mainGame->yScale)); mainGame->btnCardSelect[i]->setRelativePosition(rect<s32>((30 + i * 125) * mainGame->xScale, 65 * mainGame->yScale, (30 + 120 + i * 125) * mainGame->xScale, 235 * mainGame->yScale));
// text // text
wchar_t formatBuffer[2048]; wchar_t formatBuffer[2048];
if(sort_list.size()) { if(mainGame->dInfo.curMsg == MSG_SORT_CARD) {
if(sort_list[pos + i] > 0) if(sort_list[pos + i])
myswprintf(formatBuffer, L"%d", sort_list[pos + i]); myswprintf(formatBuffer, L"%d", sort_list[pos + i]);
else else
myswprintf(formatBuffer, L""); myswprintf(formatBuffer, L"");
...@@ -2789,6 +2789,7 @@ void ClientField::CancelOrFinish() { ...@@ -2789,6 +2789,7 @@ void ClientField::CancelOrFinish() {
if(mainGame->wCardSelect->isVisible()) { if(mainGame->wCardSelect->isVisible()) {
DuelClient::SetResponseI(-1); DuelClient::SetResponseI(-1);
mainGame->HideElement(mainGame->wCardSelect, true); mainGame->HideElement(mainGame->wCardSelect, true);
sort_list.clear();
} }
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