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

[drmccoy at users.sourceforge.net]

Revision: 22796
Author:   drmccoy
Date:     2006-05-31 03:55:57 -0700 (Wed, 31 May 2006)
ViewCVS:  http://svn.sourceforge.net/scummvm/?rev=22796&view=rev

Log Message:
-----------
Hopefully fixed bug #1498024

Modified Paths:
--------------
    scummvm/trunk/engines/gob/goblin.cpp
Modified: scummvm/trunk/engines/gob/goblin.cpp
===================================================================
--- scummvm/trunk/engines/gob/goblin.cpp	2006-05-31 10:55:09 UTC (rev 22795)
+++ scummvm/trunk/engines/gob/goblin.cpp	2006-05-31 10:55:57 UTC (rev 22796)
@@ -933,12 +933,14 @@
 				}
 			}
 
-			if ((_vm->_map->_itemsMap[_pressedMapY +
-				    1][_pressedMapX]) ==
-			    (_vm->_map->_itemsMap[_pressedMapY][_pressedMapX])) {
-				_pressedMapY++;
-				_vm->_map->_destY = _pressedMapY;
-				_gobDestY = _pressedMapY;
+			if (_pressedMapY < (_vm->_map->_mapHeight-1)) {
+				if ((_vm->_map->_itemsMap[_pressedMapY +
+							1][_pressedMapX]) ==
+						(_vm->_map->_itemsMap[_pressedMapY][_pressedMapX])) {
+					_pressedMapY++;
+					_vm->_map->_destY = _pressedMapY;
+					_gobDestY = _pressedMapY;
+				}
 			}
 
 		}
@@ -1024,8 +1026,8 @@
 			break;
 		}
 
-		_pressedMapX = posX / 12;
-		_pressedMapY = posY / 6;
+		_pressedMapX = MIN(posX / 12, 25);
+		_pressedMapY = MIN(posY / 6, 27);
 
 		if (_vm->_map->_itemsMap[_pressedMapY][_pressedMapX] == 0
 		    && i < 20) {


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