[Scummvm-cvs-logs] SF.net SVN: scummvm: [25402] scummvm/trunk/engines/gob

[drmccoy at users.sourceforge.net]

Revision: 25402
          http://scummvm.svn.sourceforge.net/scummvm/?rev=25402&view=rev
Author:   drmccoy
Date:     2007-02-06 11:16:41 -0800 (Tue, 06 Feb 2007)

Log Message:
-----------
- Fixed Ween's inventory in the volcano (#1630113)
- Added a range check to avoid invalid reads into _wayPoints in Map::checkDirectPath()

Modified Paths:
--------------
    scummvm/trunk/engines/gob/game_v2.cpp
    scummvm/trunk/engines/gob/map.cpp

Modified: scummvm/trunk/engines/gob/game_v2.cpp
===================================================================
--- scummvm/trunk/engines/gob/game_v2.cpp	2007-02-06 14:42:05 UTC (rev 25401)
+++ scummvm/trunk/engines/gob/game_v2.cpp	2007-02-06 19:16:41 UTC (rev 25402)
@@ -282,7 +282,7 @@
 		_vm->_inter->initControlVars(0);
 		_vm->_scenery->_pCaptureCounter = oldCaptureCounter;
 		_vm->_global->_inter_execPtr = (char *)_totFileData;
-		_vm->_global->_inter_execPtr += (int16) READ_LE_UINT16(_totFileData + (skipPlay << 1) + 0x66);
+		_vm->_global->_inter_execPtr += READ_LE_UINT16(_totFileData + (skipPlay << 1) + 0x66);
 		_vm->_inter->callSub(2);
 		if (_vm->_inter->_terminate != 0)
 			_vm->_inter->_terminate = 2;

Modified: scummvm/trunk/engines/gob/map.cpp
===================================================================
--- scummvm/trunk/engines/gob/map.cpp	2007-02-06 14:42:05 UTC (rev 25401)
+++ scummvm/trunk/engines/gob/map.cpp	2007-02-06 19:16:41 UTC (rev 25402)
@@ -258,7 +258,7 @@
 			if (obj->nearestWayPoint < obj->nearestDest)
 				if (_wayPoints[obj->nearestWayPoint + 1].field_2 == 1)
 					return 3;
-			if (_wayPoints[obj->nearestDest - 1].field_2 == 1)
+			if ((obj->nearestDest > 0) && (_wayPoints[obj->nearestDest - 1].field_2 == 1))
 				return 3;
 		}
 


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