[Scummvm-cvs-logs] SF.net SVN: scummvm: [21905] scummvm/trunk/engines/simon

[kirben at users.sourceforge.net]

Revision: 21905
Author:   kirben
Date:     2006-04-15 05:19:38 -0700 (Sat, 15 Apr 2006)
ViewCVS:  http://svn.sourceforge.net/scummvm/?rev=21905&view=rev

Log Message:
-----------
Increase size of variable array entries, to prevent overflows that often occur in FF. The original FF used unsigned variable arrays, but Simon 1/2 requires a signed variable array.

Modified Paths:
--------------
    scummvm/trunk/engines/simon/simon.h
    scummvm/trunk/engines/simon/vga.cpp
Modified: scummvm/trunk/engines/simon/simon.h
===================================================================
--- scummvm/trunk/engines/simon/simon.h	2006-04-15 07:56:55 UTC (rev 21904)
+++ scummvm/trunk/engines/simon/simon.h	2006-04-15 12:19:38 UTC (rev 21905)
@@ -385,8 +385,8 @@
 	uint16 _speechIdArray4[40];
 
 	uint16 _bitArray[48];
-	int16 _variableArray[256];
-	int16 _variableArray2[256];
+	int32 _variableArray[256];
+	int32 _variableArray2[256];
 
 	WindowBlock *_windowArray[16];
 

Modified: scummvm/trunk/engines/simon/vga.cpp
===================================================================
--- scummvm/trunk/engines/simon/vga.cpp	2006-04-15 07:56:55 UTC (rev 21904)
+++ scummvm/trunk/engines/simon/vga.cpp	2006-04-15 12:19:38 UTC (rev 21905)
@@ -1909,7 +1909,7 @@
 
 		int step;
 		int y1, y2;
-		int16 *vp;
+		int32 *vp;
 
 		step = 2;
 		if (c < 0) {


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