aboutsummaryrefslogtreecommitdiff
path: root/engines/simon
diff options
context:
space:
mode:
authorTravis Howell2006-04-15 12:19:38 +0000
committerTravis Howell2006-04-15 12:19:38 +0000
commit2f024e270199d5fc2d38d62150b689a1fdca0b1d (patch)
treefb810352797b4c9bffaa7bd2179f0425d42de428 /engines/simon
parent5e8f44fcf261bdf414e308dd3f71f6f0cb9b2f13 (diff)
downloadscummvm-rg350-2f024e270199d5fc2d38d62150b689a1fdca0b1d.tar.gz
scummvm-rg350-2f024e270199d5fc2d38d62150b689a1fdca0b1d.tar.bz2
scummvm-rg350-2f024e270199d5fc2d38d62150b689a1fdca0b1d.zip
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.
svn-id: r21905
Diffstat (limited to 'engines/simon')
-rw-r--r--engines/simon/simon.h4
-rw-r--r--engines/simon/vga.cpp2
2 files changed, 3 insertions, 3 deletions
diff --git a/engines/simon/simon.h b/engines/simon/simon.h
index 117508c184..cbe6c7935e 100644
--- a/engines/simon/simon.h
+++ b/engines/simon/simon.h
@@ -385,8 +385,8 @@ protected:
uint16 _speechIdArray4[40];
uint16 _bitArray[48];
- int16 _variableArray[256];
- int16 _variableArray2[256];
+ int32 _variableArray[256];
+ int32 _variableArray2[256];
WindowBlock *_windowArray[16];
diff --git a/engines/simon/vga.cpp b/engines/simon/vga.cpp
index a6856240d6..c78835c878 100644
--- a/engines/simon/vga.cpp
+++ b/engines/simon/vga.cpp
@@ -1909,7 +1909,7 @@ void SimonEngine::vc48_setPathFinder() {
int step;
int y1, y2;
- int16 *vp;
+ int32 *vp;
step = 2;
if (c < 0) {