Skip to content

Y
ygopro
Commit 96eac357 authored by mercury233's avatar mercury233
Browse files
Options

Merge https://github.com/Fluorohydride/ygopro

parents e9650adb e4cdeccd
Show whitespace changes
Inline Side-by-side
Showing with 4 additions and 0 deletions
gframe/event_handler.cpp
View file @ 96eac357
...@@ -835,6 +835,8 @@ bool ClientField::OnEvent(const irr::SEvent& event) { ...@@ -835,6 +835,8 @@ bool ClientField::OnEvent(const irr::SEvent& event) {
break; break;
} else { } else {
mainGame->HideElement(mainGame->wCardSelect); mainGame->HideElement(mainGame->wCardSelect);
if(mainGame->dInfo.curMsg == MSG_SELECT_CHAIN && !chain_forced)
ShowCancelOrFinishButton(1);
break; break;
} }
break; break;
...@@ -1482,6 +1484,8 @@ bool ClientField::OnEvent(const irr::SEvent& event) { ...@@ -1482,6 +1484,8 @@ bool ClientField::OnEvent(const irr::SEvent& event) {
case irr::EMIE_RMOUSE_LEFT_UP: { case irr::EMIE_RMOUSE_LEFT_UP: {
if(mainGame->dInfo.isReplay) if(mainGame->dInfo.isReplay)
break; break;
if(event.MouseInput.isLeftPressed())
break;
s32 x = event.MouseInput.X; s32 x = event.MouseInput.X;
s32 y = event.MouseInput.Y; s32 y = event.MouseInput.Y;
irr::core::position2di pos(x, y); irr::core::position2di pos(x, y);
......
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