Commit 70fe508d authored by fallenstardust's avatar fallenstardust

可在连锁询问,宣言等对话框显示时允许点击查看墓地,除外,额外

parent 669a434a
...@@ -366,9 +366,9 @@ bool ClientField::OnEvent(const irr::SEvent& event) { ...@@ -366,9 +366,9 @@ bool ClientField::OnEvent(const irr::SEvent& event) {
break; break;
} }
case BUTTON_OPTION_0: case BUTTON_OPTION_0:
case BUTTON_OPTION_1: case BUTTON_OPTION_1:
case BUTTON_OPTION_2: case BUTTON_OPTION_2:
case BUTTON_OPTION_3: case BUTTON_OPTION_3:
case BUTTON_OPTION_4: { case BUTTON_OPTION_4: {
mainGame->soundManager->PlaySoundEffect(SoundManager::SFX::BUTTON); mainGame->soundManager->PlaySoundEffect(SoundManager::SFX::BUTTON);
int step = mainGame->scrOption->isVisible() ? mainGame->scrOption->getPos() : 0; int step = mainGame->scrOption->isVisible() ? mainGame->scrOption->getPos() : 0;
...@@ -1731,13 +1731,71 @@ bool ClientField::OnEvent(const irr::SEvent& event) { ...@@ -1731,13 +1731,71 @@ bool ClientField::OnEvent(const irr::SEvent& event) {
case irr::EMIE_LMOUSE_PRESSED_DOWN: { case irr::EMIE_LMOUSE_PRESSED_DOWN: {
if(!mainGame->dInfo.isStarted) if(!mainGame->dInfo.isStarted)
break; break;
if(mainGame->gameConf.control_mode == 1 && event.MouseInput.X > 300 * mainGame->xScale) { if(mainGame->wCardSelect->isVisible())
mainGame->always_chain = event.MouseInput.isLeftPressed(); break;
mainGame->ignore_chain = false; selectable_cards.clear();
mainGame->chain_when_avail = false; if (mainGame->wQuery->isVisible() || mainGame->wANAttribute->isVisible() || mainGame->wANCard->isVisible() || mainGame->wANNumber->isVisible() || mainGame->wOptions->isVisible()){
UpdateChainButtons(); wchar_t formatBuffer[2048];
} switch(hovered_location) {
break; /* test unable check deck and overlay unit
case LOCATION_DECK: {
if(deck[hovered_controler].size() == 0)
break;
for(int32 i = (int32)deck[hovered_controler].size() - 1; i >= 0 ; --i)
selectable_cards.push_back(deck[hovered_controler][i]);
myswprintf(formatBuffer, L"%ls(%d)", dataManager.GetSysString(1000), deck[hovered_controler].size());
mainGame->stCardSelect->setText(formatBuffer);
break;
}
case LOCATION_MZONE: {
if(!clicked_card || clicked_card->overlayed.size() == 0)
break;
for(int32 i = 0; i < (int32)clicked_card->overlayed.size(); ++i)
selectable_cards.push_back(clicked_card->overlayed[i]);
myswprintf(formatBuffer, L"%ls(%d)", dataManager.GetSysString(1007), clicked_card->overlayed.size());
mainGame->stCardSelect->setText(formatBuffer);
break;
}
*/
case LOCATION_GRAVE: {
if(grave[hovered_controler].size() == 0)
break;
for(int32 i = (int32)grave[hovered_controler].size() - 1; i >= 0 ; --i)
selectable_cards.push_back(grave[hovered_controler][i]);
myswprintf(formatBuffer, L"%ls(%d)", dataManager.GetSysString(1004), grave[hovered_controler].size());
mainGame->stCardSelect->setText(formatBuffer);
break;
}
case LOCATION_REMOVED: {
if(remove[hovered_controler].size() == 0)
break;
for(int32 i = (int32)remove[hovered_controler].size() - 1; i >= 0 ; --i)
selectable_cards.push_back(remove[hovered_controler][i]);
myswprintf(formatBuffer, L"%ls(%d)", dataManager.GetSysString(1005), remove[hovered_controler].size());
mainGame->stCardSelect->setText(formatBuffer);
break;
}
case LOCATION_EXTRA: {
if(extra[hovered_controler].size() == 0)
break;
for(int32 i = (int32)extra[hovered_controler].size() - 1; i >= 0 ; --i)
selectable_cards.push_back(extra[hovered_controler][i]);
myswprintf(formatBuffer, L"%ls(%d)", dataManager.GetSysString(1006), extra[hovered_controler].size());
mainGame->stCardSelect->setText(formatBuffer);
break;
}
}
if(selectable_cards.size())
ShowSelectCard(true);
break;
}
if(mainGame->gameConf.control_mode == 1 && event.MouseInput.X > 300 * mainGame->xScale) {
mainGame->always_chain = event.MouseInput.isLeftPressed();
mainGame->ignore_chain = false;
mainGame->chain_when_avail = false;
UpdateChainButtons();
}
break;
} }
case irr::EMIE_RMOUSE_PRESSED_DOWN: { case irr::EMIE_RMOUSE_PRESSED_DOWN: {
if(!mainGame->dInfo.isStarted) if(!mainGame->dInfo.isStarted)
......
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