diff options
| author | Max Horn | 2002-08-18 22:00:22 +0000 |
|---|---|---|
| committer | Max Horn | 2002-08-18 22:00:22 +0000 |
| commit | ad5b605ba1840c256fc934fd9b53c94cc9393d6e (patch) | |
| tree | 4a85c6e91c9b6424de9b79470d1f832dbee12aee | |
| parent | d7683be5922f1e885e9aed79da46835add0c85f4 (diff) | |
| download | scummvm-rg350-ad5b605ba1840c256fc934fd9b53c94cc9393d6e.tar.gz scummvm-rg350-ad5b605ba1840c256fc934fd9b53c94cc9393d6e.tar.bz2 scummvm-rg350-ad5b605ba1840c256fc934fd9b53c94cc9393d6e.zip | |
get rid of g_simon; get rid of unused _last_mouse_event member
svn-id: r4768
| -rw-r--r-- | wince/pocketpc.cpp | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/wince/pocketpc.cpp b/wince/pocketpc.cpp index 0bb9c1b21b..0162d14e28 100644 --- a/wince/pocketpc.cpp +++ b/wince/pocketpc.cpp @@ -57,7 +57,6 @@ typedef int (*tTimeCallback)(int); typedef void SoundProc(void *param, byte *buf, int len); GameDetector detector; -SimonState *g_simon; Config *scummcfg; tTimeCallback timer_callback; int timer_interval; @@ -173,7 +172,6 @@ private: byte *_gfx_buf; uint32 _start_time; Event _event; - Event _last_mouse_event; HMODULE hInst; HWND hWnd; bool _display_cursor; @@ -687,7 +685,6 @@ LRESULT CALLBACK OSystem_WINCE3::WndProc(HWND hWnd, UINT message, WPARAM wParam, wm->_event.event_code = EVENT_MOUSEMOVE; wm->_event.mouse.x = x; wm->_event.mouse.y = y; - wm->_last_mouse_event = wm->_event; } break; case WM_LBUTTONDOWN: @@ -761,7 +758,6 @@ LRESULT CALLBACK OSystem_WINCE3::WndProc(HWND hWnd, UINT message, WPARAM wParam, wm->_event.event_code = EVENT_LBUTTONDOWN; wm->_event.mouse.x = x; wm->_event.mouse.y = y; - wm->_last_mouse_event = wm->_event; break; } @@ -775,7 +771,6 @@ LRESULT CALLBACK OSystem_WINCE3::WndProc(HWND hWnd, UINT message, WPARAM wParam, wm->_event.event_code = EVENT_LBUTTONDOWN; wm->_event.mouse.x = x; wm->_event.mouse.y = y; - wm->_last_mouse_event = wm->_event; /* if(y > 200 && !hide_toolbar) @@ -826,8 +821,12 @@ LRESULT CALLBACK OSystem_WINCE3::WndProc(HWND hWnd, UINT message, WPARAM wParam, toolbar_drawn = false; break; case ToolbarSkip: - if (detector._gameId >= GID_SIMON_FIRST) { - g_simon->_exit_cutscene = true; + if (detector._gameId >= GID_SIMON_FIRST && + detector._gameId <= GID_SIMON_LAST) { + // Fake a right click to abort the current cut scene + wm->_event.event_code = EVENT_RBUTTONDOWN; + wm->_event.mouse.x = x; + wm->_event.mouse.y = y; break; } wm->_event.event_code = EVENT_KEYDOWN; @@ -855,7 +854,6 @@ LRESULT CALLBACK OSystem_WINCE3::WndProc(HWND hWnd, UINT message, WPARAM wParam, wm->_event.event_code = EVENT_LBUTTONUP; wm->_event.mouse.x = x; wm->_event.mouse.y = y; - wm->_last_mouse_event = wm->_event; } break; case WM_LBUTTONDBLCLK: // doesn't seem to work right now |