Commit 06abd3b4 authored by edo9300's avatar edo9300

added overlayed list in szone and fixed spsummn_proc_g from banish

parent 7d257920
...@@ -527,6 +527,12 @@ bool ClientField::OnEvent(const irr::SEvent& event) { ...@@ -527,6 +527,12 @@ bool ClientField::OnEvent(const irr::SEvent& event) {
selectable_cards.push_back(grave[command_controler][i]); selectable_cards.push_back(grave[command_controler][i]);
break; break;
} }
case LOCATION_REMOVED: {
for (size_t i = 0; i < remove[command_controler].size(); ++i)
if (remove[command_controler][i]->cmdFlag & COMMAND_SPSUMMON)
selectable_cards.push_back(remove[command_controler][i]);
break;
}
case LOCATION_EXTRA: { case LOCATION_EXTRA: {
for(size_t i = 0; i < extra[command_controler].size(); ++i) for(size_t i = 0; i < extra[command_controler].size(); ++i)
if(extra[command_controler][i]->cmdFlag & COMMAND_SPSUMMON) if(extra[command_controler][i]->cmdFlag & COMMAND_SPSUMMON)
...@@ -612,6 +618,14 @@ bool ClientField::OnEvent(const irr::SEvent& event) { ...@@ -612,6 +618,14 @@ bool ClientField::OnEvent(const irr::SEvent& event) {
mainGame->wCardSelect->setText(formatBuffer); mainGame->wCardSelect->setText(formatBuffer);
break; break;
} }
case LOCATION_SZONE: {
ClientCard* pcard = szone[command_controler][command_sequence];
for (int32 i = 0; i < (int32)pcard->overlayed.size(); ++i)
selectable_cards.push_back(pcard->overlayed[i]);
myswprintf(formatBuffer, L"%ls(%d)", dataManager.GetSysString(1007), pcard->overlayed.size());
mainGame->wCardSelect->setText(formatBuffer);
break;
}
case LOCATION_GRAVE: { case LOCATION_GRAVE: {
for(int32 i = (int32)grave[command_controler].size() - 1; i >= 0 ; --i) for(int32 i = (int32)grave[command_controler].size() - 1; i >= 0 ; --i)
selectable_cards.push_back(grave[command_controler][i]); selectable_cards.push_back(grave[command_controler][i]);
......
...@@ -1365,8 +1365,6 @@ void Game::OnResize() ...@@ -1365,8 +1365,6 @@ void Game::OnResize()
wRules->setRelativePosition(mainGame->ResizeWin(630, 100, 1000, 310)); wRules->setRelativePosition(mainGame->ResizeWin(630, 100, 1000, 310));
wReplay->setRelativePosition(mainGame->ResizeWin(220, 100, 800, 520)); wReplay->setRelativePosition(mainGame->ResizeWin(220, 100, 800, 520));
wSinglePlay->setRelativePosition(mainGame->ResizeWin(220, 100, 800, 520)); wSinglePlay->setRelativePosition(mainGame->ResizeWin(220, 100, 800, 520));
wChat->setRelativePosition(mainGame->ResizeWin(305, 615, 1020, 640, true));
ebChatInput->setRelativePosition(recti(3, 2, mainGame->window_size.Width - wChat->getRelativePosition().UpperLeftCorner.X - 6, 22));
wHand->setRelativePosition(ResizeWin(500, 450, 825, 605)); wHand->setRelativePosition(ResizeWin(500, 450, 825, 605));
wFTSelect->setRelativePosition(ResizeWin(550, 240, 780, 340)); wFTSelect->setRelativePosition(ResizeWin(550, 240, 780, 340));
...@@ -1395,6 +1393,9 @@ void Game::OnResize() ...@@ -1395,6 +1393,9 @@ void Game::OnResize()
btnClearLog->setRelativePosition(mainGame->Resize(160, 300, 260, 325)); btnClearLog->setRelativePosition(mainGame->Resize(160, 300, 260, 325));
srcVolume->setRelativePosition(rect<s32>(85, 295, wInfos->getRelativePosition().LowerRightCorner.X - 21, 310)); srcVolume->setRelativePosition(rect<s32>(85, 295, wInfos->getRelativePosition().LowerRightCorner.X - 21, 310));
wChat->setRelativePosition(mainGame->ResizeWin(wInfos->getRelativePosition().LowerRightCorner.X + 6, 615, 1020, 640, true));
ebChatInput->setRelativePosition(recti(3, 2, mainGame->window_size.Width - wChat->getRelativePosition().UpperLeftCorner.X - 6, 22));
btnLeaveGame->setRelativePosition(Resize(205, 5, 295, 80)); btnLeaveGame->setRelativePosition(Resize(205, 5, 295, 80));
wReplayControl->setRelativePosition(Resize(205, 143, 295, 273)); wReplayControl->setRelativePosition(Resize(205, 143, 295, 273));
btnReplayStart->setRelativePosition(Resize(5, 5, 85, 25)); btnReplayStart->setRelativePosition(Resize(5, 5, 85, 25));
......
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