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

Touch events are now handled before key events

Browse Source
This commit is contained in:
Xawotihs
2011-08-07 19:48:01 +00:00
parent 765b6b0412
commit 4dd8eaadad
1 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
projects/mtg/src/CardSelector.cpp
View File

@@ -185,14 +185,22 @@ bool CardSelector::CheckUserInput(JButton key)
return true;
}
Target* oldactive = active;
int x,y;
if(JGE::GetInstance()->GetLeftClickCoordinates(x, y))
{
active = closest<True> (cards, limitor, static_cast<float> (x), static_cast<float> (y));
}
switch (key)
{
case JGE_BTN_SEC:
GameObserver::GetInstance()->cancelCurrentAction();
return true;
goto switch_active;
break;
case JGE_BTN_OK:
GameObserver::GetInstance()->ButtonPressed(active);
return true;
goto switch_active;
break;
case JGE_BTN_LEFT:
active = closest<Left> (cards, limitor, active);
@@ -215,12 +223,7 @@ bool CardSelector::CheckUserInput(JButton key)
return true;
default:
{
int x,y;
if(JGE::GetInstance()->GetLeftClickCoordinates(x, y))
{
active = closest<True> (cards, limitor, static_cast<float> (x), static_cast<float> (y));
}
else
if(!JGE::GetInstance()->GetLeftClickCoordinates(x, y))
{
return false;
}
@@ -289,6 +292,8 @@ bool CardSelector::CheckUserInput(JButton key)
}
}
}
switch_active:
if (active != oldactive)
{
{