[Scummvm-cvs-logs] SF.net SVN: scummvm: [26562] scummvm/trunk/engines/agi

[sev at users.sourceforge.net]

Revision: 26562
          http://scummvm.svn.sourceforge.net/scummvm/?rev=26562&view=rev
Author:   sev
Date:     2007-04-21 14:47:14 -0700 (Sat, 21 Apr 2007)

Log Message:
-----------
Patch #1704914: "Fix for #1671426: MH2 : Doesn't recognize Enter for actions"

Modified Paths:
--------------
    scummvm/trunk/engines/agi/agi.h
    scummvm/trunk/engines/agi/detection.cpp
    scummvm/trunk/engines/agi/keyboard.cpp

Modified: scummvm/trunk/engines/agi/agi.h
===================================================================
--- scummvm/trunk/engines/agi/agi.h	2007-04-21 21:39:27 UTC (rev 26561)
+++ scummvm/trunk/engines/agi/agi.h	2007-04-21 21:47:14 UTC (rev 26562)
@@ -110,7 +110,8 @@
 	GF_AGIPAL =      (1 << 4),
 	GF_MACGOLDRUSH = (1 << 5),
 	GF_FANMADE =     (1 << 6),
-	GF_ESC_MENU =    (1 << 7) 
+	GF_ESC_MENU =    (1 << 7),
+	GF_MANHUNTER =   (1 << 8)
 };
 
 struct AGIGameDescription;

Modified: scummvm/trunk/engines/agi/detection.cpp
===================================================================
--- scummvm/trunk/engines/agi/detection.cpp	2007-04-21 21:39:27 UTC (rev 26561)
+++ scummvm/trunk/engines/agi/detection.cpp	2007-04-21 21:47:14 UTC (rev 26562)
@@ -897,7 +897,7 @@
 			Common::ADGF_NO_FLAGS
 		},
 		GType_V3,
-		0,
+		GF_MANHUNTER,
 		0x3149,
 	},
 
@@ -913,7 +913,7 @@
 			Common::ADGF_NO_FLAGS
 		},
 		GType_V3,
-		0,
+		GF_MANHUNTER,
 		0x3149,
 	},
 
@@ -929,7 +929,7 @@
 			Common::ADGF_NO_FLAGS
 		},
 		GType_V3,
-		0,
+		GF_MANHUNTER,
 		0x3149,
 	},
 
@@ -946,7 +946,7 @@
 			Common::ADGF_NO_FLAGS
 		},
 		GType_V3,
-		0,
+		GF_MANHUNTER,
 		0x3149,
 	},
 
@@ -962,7 +962,7 @@
 			Common::ADGF_NO_FLAGS
 		},
 		GType_V3,
-		0,
+		GF_MANHUNTER,
 		0x3149,
 	},
 
@@ -978,7 +978,7 @@
 			Common::ADGF_NO_FLAGS
 		},
 		GType_V3,
-		0,
+		GF_MANHUNTER,
 		0x3149,
 	},
 
@@ -994,7 +994,7 @@
 			Common::ADGF_NO_FLAGS
 		},
 		GType_V3,
-		0,
+		GF_MANHUNTER,
 		0x3086,
 	},
 
@@ -1010,7 +1010,7 @@
 			Common::ADGF_NO_FLAGS
 		},
 		GType_V3,
-		0,
+		GF_MANHUNTER,
 		0x3149,
 	},
 
@@ -1026,7 +1026,7 @@
 			Common::ADGF_NO_FLAGS
 		},
 		GType_V3,
-		0,
+		GF_MANHUNTER,
 		0x3149,
 	},
 

Modified: scummvm/trunk/engines/agi/keyboard.cpp
===================================================================
--- scummvm/trunk/engines/agi/keyboard.cpp	2007-04-21 21:39:27 UTC (rev 26561)
+++ scummvm/trunk/engines/agi/keyboard.cpp	2007-04-21 21:47:14 UTC (rev 26562)
@@ -92,6 +92,11 @@
 	/* If a key is ready, rip it */
 	if (_gfx->keypress()) {
 		key = _gfx->getKey();
+
+		if ((getFeatures() & GF_MANHUNTER) && (key == KEY_ENTER) &&
+			(_game.inputMode == INPUT_NONE))
+			key = 0x20; // Set Enter key to Space in Manhunter when there's no text input
+
 		debugC(3, kDebugLevelInput, "key %02x pressed", key);
 	}
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.