[Scummvm-cvs-logs] SF.net SVN: scummvm:[55097] scummvm/trunk/engines/hugo

[strangerke at users.sourceforge.net]

Revision: 55097
          http://scummvm.svn.sourceforge.net/scummvm/?rev=55097&view=rev
Author:   strangerke
Date:     2011-01-02 21:32:56 +0000 (Sun, 02 Jan 2011)

Log Message:
-----------
HUGO: Fix 2 bugs that were causing several crashes using the mouse

Modified Paths:
--------------
    scummvm/trunk/engines/hugo/hugo.cpp
    scummvm/trunk/engines/hugo/object.cpp

Modified: scummvm/trunk/engines/hugo/hugo.cpp
===================================================================
--- scummvm/trunk/engines/hugo/hugo.cpp	2011-01-02 17:06:43 UTC (rev 55096)
+++ scummvm/trunk/engines/hugo/hugo.cpp	2011-01-02 21:32:56 UTC (rev 55097)
@@ -1173,7 +1173,7 @@
 	debugC(1, kDebugEngine, "useBG(%s)", name);
 
 	objectList_t p = _backgroundObjects[*_screen_p];
-	for (int i = 0; *_arrayVerbs[p[i].verbIndex]; i++) {
+	for (int i = 0; p[i].verbIndex != 0; i++) {
 		if ((name == _arrayNouns[p[i].nounIndex][0] &&
 		     p[i].verbIndex != _look) &&
 		    ((p[i].roomState == DONT_CARE) || (p[i].roomState == _screenStates[*_screen_p])))

Modified: scummvm/trunk/engines/hugo/object.cpp
===================================================================
--- scummvm/trunk/engines/hugo/object.cpp	2011-01-02 17:06:43 UTC (rev 55096)
+++ scummvm/trunk/engines/hugo/object.cpp	2011-01-02 21:32:56 UTC (rev 55097)
@@ -118,7 +118,8 @@
 			if (_vm->getGameStatus().inventoryObjId == use->objId) {
 				// Look for secondary object, if found use matching verb
 				bool foundFl = false;
-				for (target_t *target = use->targets; _vm->_arrayNouns[target->nounIndex] != 0; target++)
+				
+				for (target_t *target = use->targets; target->nounIndex != 0; target++)
 					if (target->nounIndex == obj->nounIndex) {
 						foundFl = true;
 						sprintf(_line, "%s %s %s", _vm->_arrayVerbs[target->verbIndex][0],


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