[Scummvm-cvs-logs] CVS: scummvm/backends/wince findgame.cpp,1.13,1.14 pocketpc.cpp,1.29,1.30 smartphone.cpp,1.14,1.15 wince.cpp,1.26,1.27 wince.h,1.12,1.13

[Nicolas Bacca]

Update of /cvsroot/scummvm/scummvm/backends/wince
In directory sc8-pr-cvs1:/tmp/cvs-serv21312

Modified Files:
	findgame.cpp pocketpc.cpp smartphone.cpp wince.cpp wince.h 
Log Message:
Preliminary support for queen in the old codebase ...

Index: findgame.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/wince/findgame.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- findgame.cpp	12 Oct 2003 13:35:31 -0000	1.13
+++ findgame.cpp	22 Dec 2003 11:25:42 -0000	1.14
@@ -41,7 +41,7 @@
 
 #define CURRENT_GAMES_VERSION 7
 
-#define MAX_GAMES 32
+#define MAX_GAMES 34
 int MAX_DIRECTORY = 40;
 
 #define MAX_DISPLAYED_DIRECTORIES 7
@@ -295,6 +295,21 @@
 		 "", "R2CTLNS.OCX", "",
 		 "sword2alt",
 		 0
+	},
+	
+	{
+		"Flight of Amazon Queen",
+		"Completable",
+		"", "queen.tbl", "queen.1",
+		"queen",
+		0
+	},
+	{
+		"Flight of Amazon Queen",
+		"Completable",
+		"", "queen.tbl", "queen.1c",
+		"queen",
+		0
 	},
 	{
 		 NULL, NULL, NULL, NULL, NULL, NULL, 0

Index: pocketpc.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/wince/pocketpc.cpp,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- pocketpc.cpp	12 Oct 2003 13:51:05 -0000	1.29
+++ pocketpc.cpp	22 Dec 2003 11:25:42 -0000	1.30
@@ -31,6 +31,7 @@
 extern bool is_simon;
 extern bool is_bass;
 extern bool is_sword2;
+extern bool is_queen;
 extern int num_of_dirty_square;
 extern bool toolbar_drawn;
 extern Engine *engine;
@@ -242,6 +243,8 @@
 						*/
 						/*}*/
 						wm->_event.event_code = OSystem::EVENT_KEYDOWN;
+						if (is_queen)
+							wm->_event.kbd.keycode = 282;
 						if (is_bass)
 							wm->_event.kbd.ascii = 63;
 						else
@@ -258,7 +261,7 @@
 							do_quit();
 
 						wm->_event.event_code = OSystem::EVENT_KEYDOWN;
-						if (is_simon || is_bass || is_sword2) {
+						if (is_simon || is_bass || is_sword2 || is_queen) {
 							wm->_event.kbd.ascii = mapKey(VK_ESCAPE);
 							wm->_event.kbd.keycode = mapKey(VK_ESCAPE);
 							break;

Index: smartphone.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/wince/smartphone.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- smartphone.cpp	12 Oct 2003 13:51:05 -0000	1.14
+++ smartphone.cpp	22 Dec 2003 11:25:46 -0000	1.15
@@ -59,6 +59,7 @@
 extern Engine *engine;
 extern bool is_simon;
 extern bool is_bass;
+extern bool is_queen;
 extern bool sound_activated;
 extern void Cls();
 
@@ -320,6 +321,9 @@
 			return;
 
 		wm->_event.event_code = OSystem::EVENT_KEYDOWN;
+		if (is_queen)
+			wm->_event.kbd.keycode = 282;
+		else
 		if (is_bass)
 			wm->_event.kbd.ascii = 63;
 		else
@@ -330,7 +334,7 @@
 
 
 		wm->_event.event_code = OSystem::EVENT_KEYDOWN;
-		if (is_simon || is_bass) {
+		if (is_simon || is_bass || is_queen) {
 			wm->_event.kbd.ascii = VK_ESCAPE;
 			wm->_event.kbd.keycode = VK_ESCAPE;
 			return;

Index: wince.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/wince/wince.cpp,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- wince.cpp	4 Nov 2003 23:07:30 -0000	1.26
+++ wince.cpp	22 Dec 2003 11:25:49 -0000	1.27
@@ -366,6 +366,7 @@
 bool is_simon;
 bool is_bass;
 bool is_sword2;
+bool is_queen;
 //extern Scumm *g_scumm;
 //extern SimonEngine *g_simon;
 //OSystem *g_system;
@@ -856,6 +857,12 @@
 		hide_toolbar = true;
 	*/
 
+	// Special games switches
+	is_simon = (strcmp(game_name, "simon") == 0);
+	is_bass = (strcmp(game_name, "sky") == 0);
+	is_sword2 = (strcmp(game_name, "sword2") == 0);
+	is_queen = (strcmp(game_name, "queen") == 0);
+
 	// Keyboard activated for Monkey Island 2 and Monkey 1 floppy
 	if (strcmp(game_name, "monkey2") == 0 ||
 		strcmp(game_name, "monkeyvga") == 0 ||
@@ -869,7 +876,7 @@
 	}
 
 	//new_audio_rate = (strcmp(game_name, "dig") == 0 || strcmp(game_name, "monkey") == 0);
-	new_audio_rate = (strcmp(game_name, "dig") == 0 || strcmp(game_name, "ft") == 0 || strcmp(game_name, "comi") == 0 || is_sword2);
+	new_audio_rate = (strcmp(game_name, "dig") == 0 || strcmp(game_name, "ft") == 0 || strcmp(game_name, "comi") == 0 || is_sword2 || is_queen);
 
 #ifdef USE_VORBIS
 	// Modify the sample rate on the fly if OGG is involved 
@@ -878,6 +885,7 @@
 		new_audio_rate = checkOggSampleRate(_directory);
 #endif
 
+
 	ConfMan.set("versioninfo", gScummVMVersion, Common::ConfigManager::kApplicationDomain);
 
 	// Load the plugins
@@ -900,11 +908,7 @@
 
 	/* Start the engine */
 
-	is_simon = (strcmp(detector._plugin->getName(), "simon") == 0);
-	is_bass = (strcmp(detector._plugin->getName(), "sky") == 0);
-	is_sword2 = (strcmp(detector._plugin->getName(), "sword2") == 0);
-
-	if (smartphone || strcmp(game_name, "samnmax") == 0 || strcmp(game_name, "dig") == 0 || strcmp(game_name, "ft") == 0 || strcmp(game_name, "comi") == 0 || is_sword2)
+	if (smartphone || strcmp(game_name, "samnmax") == 0 || strcmp(game_name, "dig") == 0 || strcmp(game_name, "ft") == 0 || strcmp(game_name, "comi") == 0 || is_sword2 || is_queen)
 		hide_cursor = FALSE;
 	else
 		hide_cursor = TRUE;	
@@ -916,7 +920,7 @@
 
     /* See if we need to force a mapping */
 
-    if (!smartphone && (is_bass || strcmp(game_name, "samnmax") || strcmp(game_name, "comi") || is_sword2) && !isRightClickSet()) {
+    if (!smartphone && (is_bass || strcmp(game_name, "samnmax") || strcmp(game_name, "comi") || is_sword2 || is_queen) && !isRightClickSet()) {
        Cls();
        drawWaitSelectKey();
        _force_get_key_mapping = true;
@@ -1191,6 +1195,9 @@
 	if (is_simon)
 		return;
 	else
+	if (is_queen)
+		mainClass->addEventKeyPressed(282); // "F1"
+	else
 	if (is_bass)
 		mainClass->addEventKeyPressed(63);
 	else
@@ -1241,7 +1248,7 @@
 	//OSystem_WINCE3* system;
 	//system = (OSystem_WINCE3*)g_scumm->_system;
 
-	if (is_simon || is_bass || is_sword2) {
+	if (is_simon || is_bass || is_sword2 || is_queen) {
 		//system->addEventKeyPressed(mapKey(VK_ESCAPE));
 		mainClass->addEventKeyPressed(mapKey(VK_ESCAPE));
 		return;

Index: wince.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/wince/wince.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- wince.h	12 Oct 2003 15:13:46 -0000	1.12
+++ wince.h	22 Dec 2003 11:25:51 -0000	1.13
@@ -48,6 +48,7 @@
 //#include "simon/simon.h"
 #include "gapi_keys.h"
 #include "common/config-manager.h"
+#include "base/gameDetector.h"
 
 
 #include "SDL.h"