[Scummvm-cvs-logs] CVS: scummvm/backends/dc input.cpp,1.10.2.1,1.10.2.2 selector.cpp,1.11,1.11.2.1

Marcus Comstedt marcus_c at users.sourceforge.net
Tue Aug 5 13:02:02 CEST 2003


Update of /cvsroot/scummvm/scummvm/backends/dc
In directory sc8-pr-cvs1:/tmp/cvs-serv16696

Modified Files:
      Tag: branch-0-5-0
	input.cpp selector.cpp 
Log Message:
Merged fixes from trunk:

 * Detect Simon.
 * More complete keymap.


Index: input.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/dc/input.cpp,v
retrieving revision 1.10.2.1
retrieving revision 1.10.2.2
diff -u -d -r1.10.2.1 -r1.10.2.2
--- input.cpp	28 Jul 2003 20:40:24 -0000	1.10.2.1
+++ input.cpp	5 Aug 2003 20:01:04 -0000	1.10.2.2
@@ -81,8 +81,14 @@
 	  newkey = key+((shift & 0x22)? ('!'-0x1e) : ('1'-0x1e));
 	else if(key >= 0x59 && key <= 0x61)
 	  newkey = key+('1'-0x59);
+	else if(key >= 0x2d && key <= 0x38 && key != 0x31)
+	  newkey = ((shift & 0x22)?
+		    "=¯`{ }+*½<>?" :
+		    "-^@[ ];:§,./")[key - 0x2d];
 	else if(key >= 0x3a && key <= 0x43)
 	  newkey = key+(315-0x3a);
+	else if(key >= 0x54 && key <= 0x57)
+	  newkey = "/*-+"[key-0x54];
 	else switch(key) {
 	case 0x27: case 0x62:
 	  newkey = ((shift & 0x22)? '~' : '0'); break;
@@ -108,6 +114,12 @@
 	  mouse_y++; break;
 	case 0x52:
 	  mouse_y--; break;
+	case 0x63:
+	  newkey = '.'; break;
+	case 0x64: case 0x87:
+	  newkey = ((shift & 0x22)? '_' : '\\'); break;
+	case 0x89:
+	  newkey = ((shift & 0x22)? '|' : '¥'); break;
 	}
       }
     }

Index: selector.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/dc/selector.cpp,v
retrieving revision 1.11
retrieving revision 1.11.2.1
diff -u -d -r1.11 -r1.11.2.1
--- selector.cpp	14 Jul 2003 21:29:53 -0000	1.11
+++ selector.cpp	5 Aug 2003 20:01:04 -0000	1.11.2.1
@@ -159,8 +159,29 @@
   return false;
 }
 
+static const char *checkDetect(const char *fname)
+{
+  GameDetector g;
+  const VersionSettings *gnl = version_settings;
+
+  do {
+    if (!scumm_stricmp(fname, gnl->detectname))
+      return gnl->filename;
+  } while ((++gnl)->filename);
+  return false;
+}
+
 static bool isGame(const char *fn, char *base)
 {
+  if(!strcasecmp(fn, "00.LFL") ||
+     !strcasecmp(fn, "000.LFL")) {
+    *base = '\0';
+    return true;
+  }
+  if(const char *dtct = checkDetect(fn)) {
+    strcpy(base, dtct);
+    return true;
+  }
 #if 0
   int l = strlen(fn);
   if(l>4 && (!strcasecmp(fn+l-4, ".000") ||
@@ -182,11 +203,6 @@
       return true;
   }
 #endif  
-  if(!strcasecmp(fn, "00.LFL") ||
-     !strcasecmp(fn, "000.LFL")) {
-    *base = '\0';
-    return true;
-  }
   return false;
 }
 





More information about the Scummvm-git-logs mailing list