diff options
| author | Max Horn | 2004-12-05 17:42:20 +0000 |
|---|---|---|
| committer | Max Horn | 2004-12-05 17:42:20 +0000 |
| commit | f09293b22cdec7d8b309baea0a58e93757c77913 (patch) | |
| tree | 24a0814b173e6607e88d8e71163bcbc9d9d340ac /backends/morphos | |
| parent | 8d4fcb1689a4c80fa9ef3ec84194fa791bd2c00e (diff) | |
| download | scummvm-rg350-f09293b22cdec7d8b309baea0a58e93757c77913.tar.gz scummvm-rg350-f09293b22cdec7d8b309baea0a58e93757c77913.tar.bz2 scummvm-rg350-f09293b22cdec7d8b309baea0a58e93757c77913.zip | |
Clean up OSystem::Event
svn-id: r15990
Diffstat (limited to 'backends/morphos')
| -rw-r--r-- | backends/morphos/morphos.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/backends/morphos/morphos.cpp b/backends/morphos/morphos.cpp index 1b4e16be5a..5092ead8a7 100644 --- a/backends/morphos/morphos.cpp +++ b/backends/morphos/morphos.cpp @@ -825,7 +825,7 @@ bool OSystem_MorphOS::pollEvent(Event &event) qual |= KBD_CTRL; event.kbd.flags = qual; - event.event_code = (ScummMsg->Code & IECODE_UP_PREFIX) ? EVENT_KEYUP : EVENT_KEYDOWN; + event.type = (ScummMsg->Code & IECODE_UP_PREFIX) ? EVENT_KEYUP : EVENT_KEYDOWN; ScummMsg->Code &= ~IECODE_UP_PREFIX; if (ScummMsg->Code >= RAWKEY_F1 && ScummMsg->Code <= RAWKEY_F10) @@ -849,13 +849,13 @@ bool OSystem_MorphOS::pollEvent(Event &event) /* * Wheelmouse event */ - event.event_code = (ScummMsg->Code == NM_WHEEL_UP) ? EVENT_WHEELUP : EVENT_WHEELDOWN; + event.type = (ScummMsg->Code == NM_WHEEL_UP) ? EVENT_WHEELUP : EVENT_WHEELDOWN; } else if (MapRawKey(&FakedIEvent, &charbuf, 1, NULL) == 1) { if (qual == KBD_CTRL && charbuf == 'z') { - event.event_code = EVENT_QUIT; + event.type = EVENT_QUIT; break; } else if (qual == KBD_ALT) @@ -870,7 +870,7 @@ bool OSystem_MorphOS::pollEvent(Event &event) } else if (charbuf == 'x') { - event.event_code = EVENT_QUIT; + event.type = EVENT_QUIT; break; } else if (charbuf == 0x0d) @@ -915,7 +915,7 @@ bool OSystem_MorphOS::pollEvent(Event &event) else if (FullScreenMode) newy = newy <? (ScummScrHeight >> ScummScale)-2; - event.event_code = EVENT_MOUSEMOVE; + event.type = EVENT_MOUSEMOVE; event.mouse.x = newx; event.mouse.y = newy; set_mouse_pos(event.mouse.x, event.mouse.y); @@ -932,19 +932,19 @@ bool OSystem_MorphOS::pollEvent(Event &event) switch (ScummMsg->Code) { case SELECTDOWN: - event.event_code = EVENT_LBUTTONDOWN; + event.type = EVENT_LBUTTONDOWN; break; case SELECTUP: - event.event_code = EVENT_LBUTTONUP; + event.type = EVENT_LBUTTONUP; break; case MENUDOWN: - event.event_code = EVENT_RBUTTONDOWN; + event.type = EVENT_RBUTTONDOWN; break; case MENUUP: - event.event_code = EVENT_RBUTTONUP; + event.type = EVENT_RBUTTONUP; break; default: @@ -957,7 +957,7 @@ bool OSystem_MorphOS::pollEvent(Event &event) } case IDCMP_CLOSEWINDOW: - event.event_code = EVENT_QUIT; + event.type = EVENT_QUIT; break; } |