[Scummvm-cvs-logs] SF.net SVN: scummvm: [24140] scummvm/trunk/engines/agos/agos.cpp

[kirben at users.sourceforge.net]

Revision: 24140
          http://svn.sourceforge.net/scummvm/?rev=24140&view=rev
Author:   kirben
Date:     2006-10-06 05:58:11 -0700 (Fri, 06 Oct 2006)

Log Message:
-----------
Fix dectection of hit areas in earlier games

Modified Paths:
--------------
    scummvm/trunk/engines/agos/agos.cpp

Modified: scummvm/trunk/engines/agos/agos.cpp
===================================================================
--- scummvm/trunk/engines/agos/agos.cpp	2006-10-06 09:21:34 UTC (rev 24139)
+++ scummvm/trunk/engines/agos/agos.cpp	2006-10-06 12:58:11 UTC (rev 24140)
@@ -470,7 +470,7 @@
 		}
 	}
 
-	midi.mapMT32toGM (getGameType() == GType_SIMON1 && !_native_mt32);
+	midi.mapMT32toGM (getGameType() != GType_SIMON2 && !_native_mt32);
 
 	midi.set_driver(driver);
 	int ret = midi.open();
@@ -1282,7 +1282,8 @@
 			inventoryUp(ha->window);
 		} else if (ha->id == 0x7FFC) {
 			inventoryDown(ha->window);
-		} else if (ha->id >= 101 && ha->id < 113) {
+		} else if ((getGameType() == GType_SIMON1 || getGameType() == GType_SIMON2) &&
+			(ha->id >= 101 && ha->id < 113)) {
 			_verbHitArea = ha->verb;
 			setVerb(ha);
 			_defaultVerb = 0;


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