[Scummvm-cvs-logs] CVS: scummvm/wince pocketpc.cpp,1.31,1.32

[Max Horn]

Update of /cvsroot/scummvm/scummvm/wince
In directory usw-pr-cvs1:/tmp/cvs-serv17075

Modified Files:
	pocketpc.cpp 
Log Message:
get rid of g_simon; get rid of unused _last_mouse_event member

Index: pocketpc.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/wince/pocketpc.cpp,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- pocketpc.cpp	18 Aug 2002 18:39:42 -0000	1.31
+++ pocketpc.cpp	18 Aug 2002 22:00:22 -0000	1.32
@@ -57,7 +57,6 @@
 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 @@
 	byte *_gfx_buf;
 	uint32 _start_time;
 	Event _event;
-	Event _last_mouse_event;
 	HMODULE hInst;
 	HWND hWnd;
 	bool _display_cursor;	
@@ -687,7 +685,6 @@
 			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 @@
 				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 @@
 				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 @@
 							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 @@
 			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