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

drmccoy at users.sourceforge.net drmccoy at users.sourceforge.net
Thu Jul 3 18:25:59 CEST 2008


Revision: 32895
          http://scummvm.svn.sourceforge.net/scummvm/?rev=32895&view=rev
Author:   drmccoy
Date:     2008-07-03 09:25:59 -0700 (Thu, 03 Jul 2008)

Log Message:
-----------
Fixing a crash when loading a save made within the cult/bargon building (bug #2005965)

Modified Paths:
--------------
    scummvm/trunk/engines/gob/goblin_v2.cpp

Modified: scummvm/trunk/engines/gob/goblin_v2.cpp
===================================================================
--- scummvm/trunk/engines/gob/goblin_v2.cpp	2008-07-03 16:09:54 UTC (rev 32894)
+++ scummvm/trunk/engines/gob/goblin_v2.cpp	2008-07-03 16:25:59 UTC (rev 32895)
@@ -88,7 +88,7 @@
 				(_vm->_scenery->_animBottom - _vm->_scenery->_animTop) - (y + 1) / 2;
 		*obj->pPosX = x * _vm->_map->_tilesWidth;
 	} else {
-		if (obj->goblinStates[state] != 0) {
+		if ((obj->goblinStates != 0) && (obj->goblinStates[state] != 0)) {
 			layer = obj->goblinStates[state][0].layer;
 			animation = obj->goblinStates[state][0].animation;
 			objAnim->state = state;


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




More information about the Scummvm-git-logs mailing list