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

get rid of g_simon; get rid of unused _last_mouse_event member

Browse Source 
svn-id: r4768
This commit is contained in:
Max Horn 2002-08-18 22:00:22 +00:00
parent d7683be592
commit ad5b605ba1
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
wince/pocketpc.cpp
View File

@ -57,7 +57,6 @@ typedef int (*tTimeCallback)(int);
typedef void SoundProc(void *param, byte *buf, int len); typedef void SoundProc(void *param, byte *buf, int len);
GameDetector detector; GameDetector detector;
SimonState *g_simon;
Config *scummcfg; Config *scummcfg;
tTimeCallback timer_callback; tTimeCallback timer_callback;
int timer_interval; int timer_interval;
@ -173,7 +172,6 @@ private:
byte *_gfx_buf; byte *_gfx_buf;
uint32 _start_time; uint32 _start_time;
Event _event; Event _event;
Event _last_mouse_event;
HMODULE hInst; HMODULE hInst;
HWND hWnd; HWND hWnd;
bool _display_cursor; 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.event_code = EVENT_MOUSEMOVE;
wm->_event.mouse.x = x; wm->_event.mouse.x = x;
wm->_event.mouse.y = y; wm->_event.mouse.y = y;
wm->_last_mouse_event = wm->_event;
} }
break; break;
case WM_LBUTTONDOWN: 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.event_code = EVENT_LBUTTONDOWN;
wm->_event.mouse.x = x; wm->_event.mouse.x = x;
wm->_event.mouse.y = y; wm->_event.mouse.y = y;
wm->_last_mouse_event = wm->_event;
break; break;
} }
@ -775,7 +771,6 @@ LRESULT CALLBACK OSystem_WINCE3::WndProc(HWND hWnd, UINT message, WPARAM wParam,
wm->_event.event_code = EVENT_LBUTTONDOWN; wm->_event.event_code = EVENT_LBUTTONDOWN;
wm->_event.mouse.x = x; wm->_event.mouse.x = x;
wm->_event.mouse.y = y; wm->_event.mouse.y = y;
wm->_last_mouse_event = wm->_event;
/* /*
if(y > 200 && !hide_toolbar) if(y > 200 && !hide_toolbar)
@ -826,8 +821,12 @@ LRESULT CALLBACK OSystem_WINCE3::WndProc(HWND hWnd, UINT message, WPARAM wParam,
toolbar_drawn = false; toolbar_drawn = false;
break; break;
case ToolbarSkip: case ToolbarSkip:
if (detector._gameId >= GID_SIMON_FIRST) { if (detector._gameId >= GID_SIMON_FIRST &&
g_simon->_exit_cutscene = true; 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; break;
} }
wm->_event.event_code = EVENT_KEYDOWN; 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.event_code = EVENT_LBUTTONUP;
wm->_event.mouse.x = x; wm->_event.mouse.x = x;
wm->_event.mouse.y = y; wm->_event.mouse.y = y;
wm->_last_mouse_event = wm->_event;
} }
break; break;
case WM_LBUTTONDBLCLK: // doesn't seem to work right now case WM_LBUTTONDBLCLK: // doesn't seem to work right now