Skip to content

Y
ygopro-2pick
Commit 29e2fcf4 authored by nanahira's avatar nanahira
Browse files
Options

Merge branch 'master' into server

parents 12afad4a e3e5ebd8
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 1 deletion
cards.cdb
View file @ 29e2fcf4
No preview for this file type
gframe/event_handler.cpp
View file @ 29e2fcf4
...@@ -20,6 +20,8 @@ bool ClientField::OnEvent(const irr::SEvent& event) { ...@@ -20,6 +20,8 @@ bool ClientField::OnEvent(const irr::SEvent& event) {
return false; return false;
switch(event.EventType) { switch(event.EventType) {
case irr::EET_GUI_EVENT: { case irr::EET_GUI_EVENT: {
if(mainGame->fadingList.size())
break;
s32 id = event.GUIEvent.Caller->getID(); s32 id = event.GUIEvent.Caller->getID();
switch(event.GUIEvent.EventType) { switch(event.GUIEvent.EventType) {
case irr::gui::EGET_BUTTON_CLICKED: { case irr::gui::EGET_BUTTON_CLICKED: {
......
script @ 8866a7cc
Subproject commit 4926844c23400b01a370b1d5bc8632ed911b6399 Subproject commit 8866a7cc82f43978c8cd561d54f15d57e4122079
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