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/psp | |
| 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/psp')
| -rw-r--r-- | backends/platform/psp/osys_psp.cpp | 6 | ||||
| -rw-r--r-- | backends/platform/psp/osys_psp_gu.cpp | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/backends/platform/psp/osys_psp.cpp b/backends/platform/psp/osys_psp.cpp index 88da6924b9..8d01d0cf6e 100644 --- a/backends/platform/psp/osys_psp.cpp +++ b/backends/platform/psp/osys_psp.cpp @@ -431,14 +431,14 @@ bool OSystem_PSP::pollEvent(Common::Event &event) { if (buttonsChanged & (PSP_CTRL_CROSS | PSP_CTRL_CIRCLE | PSP_CTRL_LTRIGGER | PSP_CTRL_RTRIGGER | PSP_CTRL_START | PSP_CTRL_SELECT | PSP_CTRL_SQUARE)) { if (buttonsChanged & PSP_CTRL_CROSS) { - event.type = (pad.Buttons & PSP_CTRL_CROSS) ? Common::EVENT_LBUTTONDOWN : OSystem::EVENT_LBUTTONUP; + event.type = (pad.Buttons & PSP_CTRL_CROSS) ? Common::EVENT_LBUTTONDOWN : Common::EVENT_LBUTTONUP; } else if (buttonsChanged & PSP_CTRL_CIRCLE) { - event.type = (pad.Buttons & PSP_CTRL_CIRCLE) ? Common::EVENT_RBUTTONDOWN : OSystem::EVENT_RBUTTONUP; + event.type = (pad.Buttons & PSP_CTRL_CIRCLE) ? Common::EVENT_RBUTTONDOWN : Common::EVENT_RBUTTONUP; } else { //any of the other buttons. - event.type = buttonsChanged & pad.Buttons ? Common::EVENT_KEYDOWN : OSystem::EVENT_KEYUP; + event.type = buttonsChanged & pad.Buttons ? Common::EVENT_KEYDOWN : Common::EVENT_KEYUP; event.kbd.flags = 0; if (buttonsChanged & PSP_CTRL_LTRIGGER) { diff --git a/backends/platform/psp/osys_psp_gu.cpp b/backends/platform/psp/osys_psp_gu.cpp index 871d93acba..b8d39c72ca 100644 --- a/backends/platform/psp/osys_psp_gu.cpp +++ b/backends/platform/psp/osys_psp_gu.cpp @@ -523,7 +523,7 @@ bool OSystem_PSP_GU::pollEvent(Common::Event &event) { _kbdClut[_keySelected] = 0xffff; if (buttonsChanged & PSP_CTRL_CROSS) { - event.type = (pad.Buttons & PSP_CTRL_CROSS) ? Common::EVENT_KEYDOWN : OSystem::EVENT_KEYUP; + event.type = (pad.Buttons & PSP_CTRL_CROSS) ? Common::EVENT_KEYDOWN : Common::EVENT_KEYUP; if(_keySelected > 26) { event.kbd.flags = 0; switch(_keySelected) { |