[Scummvm-cvs-logs] SF.net SVN: scummvm:[42297] scummvm/trunk/engines/sci

thebluegr at users.sourceforge.net thebluegr at users.sourceforge.net
Thu Jul 9 17:46:26 CEST 2009


Revision: 42297
          http://scummvm.svn.sourceforge.net/scummvm/?rev=42297&view=rev
Author:   thebluegr
Date:     2009-07-09 15:46:26 +0000 (Thu, 09 Jul 2009)

Log Message:
-----------
restAdjust should be a signed integer. Fixes crashes with SCI1 games that take absolute lofs parameters (a regression of commit #42260)

Modified Paths:
--------------
    scummvm/trunk/engines/sci/debug.h
    scummvm/trunk/engines/sci/engine/state.h

Modified: scummvm/trunk/engines/sci/debug.h
===================================================================
--- scummvm/trunk/engines/sci/debug.h	2009-07-09 15:36:53 UTC (rev 42296)
+++ scummvm/trunk/engines/sci/debug.h	2009-07-09 15:46:26 UTC (rev 42297)
@@ -46,7 +46,7 @@
 	int old_pc_offset;
 	StackPtr old_sp;
 	ExecStack *xs;
-	uint16 restadjust;
+	int16 restadjust;
 	reg_t *variables[4];		// global, local, temp, param, as immediate pointers
 	reg_t *variables_base[4];	// Used for referencing VM ops
 	SegmentId variables_seg[4];	// Same as above, contains segment IDs

Modified: scummvm/trunk/engines/sci/engine/state.h
===================================================================
--- scummvm/trunk/engines/sci/engine/state.h	2009-07-09 15:36:53 UTC (rev 42296)
+++ scummvm/trunk/engines/sci/engine/state.h	2009-07-09 15:46:26 UTC (rev 42297)
@@ -208,7 +208,7 @@
 	bool _executionStackPosChanged;   /**< Set to true if the execution stack position should be re-evaluated by the vm */
 
 	reg_t r_acc; /**< Accumulator */
-	uint16 restAdjust; /**< &rest register (only used for save games) */
+	int16 restAdjust; /**< &rest register (only used for save games) */
 	reg_t r_prev; /**< previous comparison result */
 
 	SegmentId stack_segment; /**< Heap area for the stack to use */


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