diff options
| author | Max Horn | 2007-03-18 21:55:57 +0000 |
|---|---|---|
| committer | Max Horn | 2007-03-18 21:55:57 +0000 |
| commit | 995a4d7cff4338848142d43b48c218b75c4fdbcc (patch) | |
| tree | 5c79939df631bd4426e2b79af68da3036979d78d /backends/platform/ps2 | |
| parent | 0bc056aee3a32de9df83d1e12417a2ae7d854651 (diff) | |
| download | scummvm-rg350-995a4d7cff4338848142d43b48c218b75c4fdbcc.tar.gz scummvm-rg350-995a4d7cff4338848142d43b48c218b75c4fdbcc.tar.bz2 scummvm-rg350-995a4d7cff4338848142d43b48c218b75c4fdbcc.zip | |
Some fixes to cope with the move of the event code from OSystem to Common
svn-id: r26233
Diffstat (limited to 'backends/platform/ps2')
| -rw-r--r-- | backends/platform/ps2/ps2input.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/backends/platform/ps2/ps2input.cpp b/backends/platform/ps2/ps2input.cpp index 5297b38747..1bb5206a9c 100644 --- a/backends/platform/ps2/ps2input.cpp +++ b/backends/platform/ps2/ps2input.cpp @@ -125,9 +125,9 @@ bool Ps2Input::pollEvent(Common::Event *event) { _mButtons = mData.buttons; if (change & (PS2MOUSE_BTN1 | PS2MOUSE_BTN2)) { if (change & PS2MOUSE_BTN1) - event->type = (_mButtons & PS2MOUSE_BTN1) ? Common::EVENT_LBUTTONDOWN : OSystem::EVENT_LBUTTONUP; + event->type = (_mButtons & PS2MOUSE_BTN1) ? Common::EVENT_LBUTTONDOWN : Common::EVENT_LBUTTONUP; else - event->type = (_mButtons & PS2MOUSE_BTN2) ? Common::EVENT_RBUTTONDOWN : OSystem::EVENT_RBUTTONUP; + event->type = (_mButtons & PS2MOUSE_BTN2) ? Common::EVENT_RBUTTONDOWN : Common::EVENT_RBUTTONUP; event->mouse.x = _posX; event->mouse.y = _posY; return true; @@ -177,9 +177,9 @@ bool Ps2Input::pollEvent(Common::Event *event) { if (checkPadMouse) { if (btnChange & (PAD_CROSS | PAD_CIRCLE)) { if (btnChange & PAD_CROSS) - event->type = (buttons & PAD_CROSS) ? Common::EVENT_LBUTTONDOWN : OSystem::EVENT_LBUTTONUP; + event->type = (buttons & PAD_CROSS) ? Common::EVENT_LBUTTONDOWN : Common::EVENT_LBUTTONUP; else - event->type = (buttons & PAD_CIRCLE) ? Common::EVENT_RBUTTONDOWN : OSystem::EVENT_RBUTTONUP; + event->type = (buttons & PAD_CIRCLE) ? Common::EVENT_RBUTTONDOWN : Common::EVENT_RBUTTONUP; event->mouse.x = _posX; event->mouse.y = _posY; _padLastButtons = buttons; @@ -238,7 +238,7 @@ bool Ps2Input::getKeyEvent(Common::Event *event, uint16 buttonCode, bool down) { buttonCode >>= 1; } if (_padCodes[entry]) { - event->type = (down) ? Common::EVENT_KEYDOWN : OSystem::EVENT_KEYUP; + event->type = (down) ? Common::EVENT_KEYDOWN : Common::EVENT_KEYUP; event->kbd.keycode = _padCodes[entry]; event->kbd.flags = _padFlags[entry]; event->kbd.ascii = mapKey(_padCodes[entry], _padFlags[entry]); |