Corrected click handling when a text message is displaying to properly dismiss the text, rather than trying to immediately perform another action
svn-id: r39088
This commit is contained in:
parent
f3a9274a45
commit
eb610d66bd
1 changed files with 21 additions and 11 deletions
|
@ -1262,6 +1262,22 @@ void closeAllMenu(void) {
|
||||||
linkedRelation = NULL;
|
linkedRelation = NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
bool checkInput(int16 *buttonPtr) {
|
||||||
|
int16 handle, button;
|
||||||
|
Common::Point pt;
|
||||||
|
|
||||||
|
getMouseStatus(&handle, &pt.x, &button, &pt.y);
|
||||||
|
|
||||||
|
if (!button)
|
||||||
|
buttonDown = 0;
|
||||||
|
else if (!buttonDown && button) {
|
||||||
|
*buttonPtr = button;
|
||||||
|
buttonDown = 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
int processInput(void) {
|
int processInput(void) {
|
||||||
int16 mouseX = 0;
|
int16 mouseX = 0;
|
||||||
int16 mouseY = 0;
|
int16 mouseY = 0;
|
||||||
|
@ -1796,13 +1812,8 @@ void mainLoop(void) {
|
||||||
}
|
}
|
||||||
|
|
||||||
if (userWait) {
|
if (userWait) {
|
||||||
int16 mouseButton;
|
int16 mouseButton = 0;
|
||||||
int16 mouseX;
|
checkInput(&mouseButton);
|
||||||
int16 mouseY;
|
|
||||||
|
|
||||||
do {
|
|
||||||
getMouseStatus(&main10, &mouseX, &mouseButton, &mouseY);
|
|
||||||
} while (mouseButton);
|
|
||||||
|
|
||||||
while (!mouseButton) {
|
while (!mouseButton) {
|
||||||
manageScripts(&relHead);
|
manageScripts(&relHead);
|
||||||
|
@ -1813,13 +1824,12 @@ void mainLoop(void) {
|
||||||
|
|
||||||
processAnimation();
|
processAnimation();
|
||||||
|
|
||||||
|
flip();
|
||||||
|
|
||||||
// not exactly this
|
// not exactly this
|
||||||
manageEvents();
|
manageEvents();
|
||||||
|
|
||||||
int16 mouseVar;
|
checkInput(&mouseButton);
|
||||||
getMouseStatus(&mouseVar, &mouseX, &mouseButton, &mouseY);
|
|
||||||
|
|
||||||
flip();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
changeScriptParamInList(-1, -1, &procHead, 9999, 0);
|
changeScriptParamInList(-1, -1, &procHead, 9999, 0);
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue