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

[kirben at users.sourceforge.net]

Revision: 24523
          http://svn.sourceforge.net/scummvm/?rev=24523&view=rev
Author:   kirben
Date:     2006-10-26 18:55:06 -0700 (Thu, 26 Oct 2006)

Log Message:
-----------
Limit game specific code

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

Modified: scummvm/trunk/engines/agos/verb.cpp
===================================================================
--- scummvm/trunk/engines/agos/verb.cpp	2006-10-27 01:36:15 UTC (rev 24522)
+++ scummvm/trunk/engines/agos/verb.cpp	2006-10-27 01:55:06 UTC (rev 24523)
@@ -376,8 +376,13 @@
 	uint count = ARRAYSIZE(_hitAreas);
 
 	do {
-		if (ha->id == hitarea_id && ha->flags != 0)
-			return ha;
+		if (getGameType() == GType_FF || getGameType() == GType_PP) {
+			if (ha->id == hitarea_id && ha->flags != 0)
+				return ha;
+		} else {
+			if (ha->id == hitarea_id)
+				return ha;
+		}
 	} while (ha++, --count);
 	return NULL;
 }
@@ -409,8 +414,10 @@
 	if (ha != NULL) {
 		ha->flags |= kBFBoxDead;
 		ha->flags &= ~kBFBoxSelected;
-		if (hitarea == 102)
+		if ((getGameType() == GType_SIMON1 || getGameType() == GType_SIMON2) &&
+			hitarea == 102) {
 			resetVerbs();
+		}
 	}
 }
 


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