[Scummvm-cvs-logs] CVS: scummvm/simon simon.cpp,1.39,1.40 simonitems.cpp,1.2,1.3

[Nicolas Bacca]

Update of /cvsroot/scummvm/scummvm/simon
In directory usw-pr-cvs1:/tmp/cvs-serv17017

Modified Files:
	simon.cpp simonitems.cpp 
Log Message:
WinCE GUI friendly

Index: simon.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/simon.cpp,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -d -r1.39 -r1.40
--- simon.cpp	7 Jul 2002 19:06:48 -0000	1.39
+++ simon.cpp	18 Jul 2002 22:51:28 -0000	1.40
@@ -31,6 +31,14 @@
 
 SimonState *g_simon;
 
+#ifdef _WIN32_WCE
+
+extern bool toolbar_drawn;
+extern bool draw_keyboard;
+
+#endif
+
+
 SimonState *SimonState::create(OSystem *syst, MidiDriver *driver)
 {
 	SimonState *s = new SimonState;
@@ -2391,6 +2399,15 @@
 	do {
 		delay(10);
 	} while (i == _timer_4);
+
+#ifdef _WIN32_WCE
+
+	if (draw_keyboard) {
+		draw_keyboard = false;
+		toolbar_drawn = false;
+	}
+
+#endif
 }
 
 
@@ -4304,6 +4321,10 @@
 				break;
 
 				case OSystem::EVENT_LBUTTONDOWN:_left_button_down++;
+#ifdef _WIN32_WCE
+				sdl_mouse_x = event.mouse.x;
+				sdl_mouse_y = event.mouse.y;
+#endif
 				break;
 
 				case OSystem::EVENT_RBUTTONDOWN:_exit_cutscene = true;

Index: simonitems.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/simonitems.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- simonitems.cpp	7 Jul 2002 19:06:48 -0000	1.2
+++ simonitems.cpp	18 Jul 2002 22:51:29 -0000	1.3
@@ -23,6 +23,13 @@
 #include "stdafx.h"
 #include "simon.h"
 
+#ifdef _WIN32_WCE
+
+extern bool toolbar_drawn;
+extern bool draw_keyboard;
+
+#endif
+
 int SimonState::runScript()
 {
 	byte opcode;
@@ -744,6 +751,13 @@
 			break;
 
 		case 132:{
+#ifdef _WIN32_WCE
+
+				if (!draw_keyboard) {
+					draw_keyboard = true;
+					toolbar_drawn = false;
+				}
+#endif
 				o_save_game();
 			}
 			break;