libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-02-04 01:46:42 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

LAB: Get rid of mouseButton()

Browse Source
This commit is contained in:
Filippos Karapetis 2015-12-17 00:35:36 +02:00 committed by Willem Jan Palenstijn
parent 09539d76ac
commit 8b16ccbea1
3 changed files with 5 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
engines/lab/eventman.cpp
View File

@ -207,31 +207,6 @@ void EventManager::setMousePos(Common::Point pos) {
processInput();
}
/**
* Checks whether or not the mouse buttons have been pressed, and the last
* co-ordinates of the button press. leftbutton tells whether to check the
* left or right button.
*/
bool EventManager::mouseButton(uint16 *x, uint16 *y, bool leftButton) {
if (leftButton) {
if (_leftClick) {
*x = (!_vm->_isHiRes) ? (uint16)_mousePos.x / 2 : (uint16)_mousePos.x;
*y = (uint16)_mousePos.y;
_leftClick = false;
return true;
}
} else {
if (_rightClick) {
*x = (!_vm->_isHiRes) ? (uint16)_mousePos.x / 2 : (uint16)_mousePos.x;
*y = (uint16)_mousePos.y;
_rightClick = false;
return true;
}
}
return false;
}
/**
* Checks whether or not a key has been pressed.
*/

1
engines/lab/eventman.h
View File

@ -89,7 +89,6 @@ private:
private:
Button *checkButtonHit(ButtonList *buttonList, Common::Point pos);
bool mouseButton(uint16 *x, uint16 *y, bool leftButton);
bool keyPress(uint16 *keyCode);
bool haveNextChar();
uint16 getNextChar();

14
engines/lab/interface.cpp
View File

@ -151,18 +151,14 @@ IntuiMessage *EventManager::getMsg() {
message._buttonId = curButton->_buttonId;
message._qualifier = qualifiers;
return &message;
} else if (mouseButton(&message._mouseX, &message._mouseY, true)) {
// Left Button
message._qualifier = IEQUALIFIER_LEFTBUTTON | qualifiers;
message._msgClass = MOUSEBUTTONS;
return &message;
} else if (mouseButton(&message._mouseX, &message._mouseY, false)) {
// Right Button
message._qualifier = IEQUALIFIER_RIGHTBUTTON | qualifiers;
} else if (_leftClick || _rightClick) {
message._qualifier = (_leftClick) ? (IEQUALIFIER_LEFTBUTTON | qualifiers) : (IEQUALIFIER_RIGHTBUTTON | qualifiers);
message._msgClass = MOUSEBUTTONS;
message._mouseX = (!_vm->_isHiRes) ? (uint16)_mousePos.x / 2 : (uint16)_mousePos.x;
message._mouseY = (uint16)_mousePos.y;
_leftClick = _rightClick = false;
return &message;
} else if (keyPress(&message._code)) {
// Keyboard key
curButton = checkNumButtonHit(_screenButtonList, message._code);
if (curButton) {