Mahtan/wagic
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed issue 677

Browse Source
This commit is contained in:
Xawotihs
2011-07-04 19:09:19 +00:00
parent 25be470f4b
commit c25dfe426f
8 changed files with 86 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
projects/mtg/src/DuelLayers.cpp
View File

@@ -66,34 +66,36 @@ void DuelLayers::CheckUserInput(int isAI)
{
JButton key;
int x, y;
while ((key = JGE::GetInstance()->ReadButton()))
while ((key = JGE::GetInstance()->ReadButton()) || JGE::GetInstance()->GetLeftClickCoordinates(x, y))
{
if ((!isAI) && (0 != key))
if ((!isAI) && ((0 != key) || JGE::GetInstance()->GetLeftClickCoordinates(x, y)))
{
if (stack->CheckUserInput(key))
if (stack->CheckUserInput(key)) {
JGE::GetInstance()->LeftClickedProcessed();
break;
if (combat->CheckUserInput(key))
}
if (combat->CheckUserInput(key)) {
JGE::GetInstance()->LeftClickedProcessed();
break;
if (avatars->CheckUserInput(key))
}
if (avatars->CheckUserInput(key)) {
JGE::GetInstance()->LeftClickedProcessed();
break; //avatars need to check their input before action (CTRL_CROSS)
if (action->CheckUserInput(key))
}
if (action->CheckUserInput(key)) {
JGE::GetInstance()->LeftClickedProcessed();
break;
if (hand->CheckUserInput(key))
}
if (hand->CheckUserInput(key)) {
JGE::GetInstance()->LeftClickedProcessed();
break;
if (CardSelectorSingleton::Instance()->CheckUserInput(key))
}
if (CardSelectorSingleton::Instance()->CheckUserInput(key)) {
JGE::GetInstance()->LeftClickedProcessed();
break;
}
}
}
if ((!isAI) && JGE::GetInstance()->GetLeftClickCoordinates(x, y))
{
if (avatars->CheckUserInput(x, y))
{
JGE::GetInstance()->LeftClickedProcessed();
}
else if (CardSelectorSingleton::Instance()->CheckUserInput(x, y))
{
JGE::GetInstance()->LeftClickedProcessed();
}
JGE::GetInstance()->LeftClickedProcessed();
}
}