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

drmccoy at users.sourceforge.net drmccoy at users.sourceforge.net
Sun Jun 14 00:10:56 CEST 2009


Revision: 41497
          http://scummvm.svn.sourceforge.net/scummvm/?rev=41497&view=rev
Author:   drmccoy
Date:     2009-06-13 22:10:55 +0000 (Sat, 13 Jun 2009)

Log Message:
-----------
Making TotTextData's item's offsets unsigned. This could fix the crash in the Polish Woodruff version (bug #2804962)

Modified Paths:
--------------
    scummvm/trunk/engines/gob/draw_v2.cpp
    scummvm/trunk/engines/gob/game.h

Modified: scummvm/trunk/engines/gob/draw_v2.cpp
===================================================================
--- scummvm/trunk/engines/gob/draw_v2.cpp	2009-06-13 21:07:05 UTC (rev 41496)
+++ scummvm/trunk/engines/gob/draw_v2.cpp	2009-06-13 22:10:55 UTC (rev 41497)
@@ -207,7 +207,7 @@
 
 	if (!_vm->_game->_totTextData || !_vm->_game->_totTextData->dataPtr ||
 	    (id >= _vm->_game->_totTextData->itemsCount) ||
-		  (_vm->_game->_totTextData->items[id].offset == -1) ||
+		  (_vm->_game->_totTextData->items[id].offset == 0xFFFF) ||
 			(_vm->_game->_totTextData->items[id].size == 0))
 		return;
 

Modified: scummvm/trunk/engines/gob/game.h
===================================================================
--- scummvm/trunk/engines/gob/game.h	2009-06-13 21:07:05 UTC (rev 41496)
+++ scummvm/trunk/engines/gob/game.h	2009-06-13 22:10:55 UTC (rev 41497)
@@ -51,7 +51,7 @@
 
 #define szGame_TotTextItem (2 + 2)
 	struct TotTextItem {
-		int16 offset;
+		uint16 offset;
 		int16 size;
 	} PACKED_STRUCT;
 


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