diff options
author | Travis Howell | 2003-12-30 06:24:47 +0000 |
---|---|---|
committer | Travis Howell | 2003-12-30 06:24:47 +0000 |
commit | d8f657adc0190c5cb388594530e9be9e97fc30b2 (patch) | |
tree | 8869cf4ffa45d8598df1e0909a737b38cc812a6d | |
parent | 55e02b5b54fc498ebbb56b3294163fe5b1a27238 (diff) | |
download | scummvm-rg350-d8f657adc0190c5cb388594530e9be9e97fc30b2.tar.gz scummvm-rg350-d8f657adc0190c5cb388594530e9be9e97fc30b2.tar.bz2 scummvm-rg350-d8f657adc0190c5cb388594530e9be9e97fc30b2.zip |
Add correct solution for drawObjectQue[] overflow in lawn mower mini games of puttputt
svn-id: r12027
-rw-r--r-- | scumm/script_v6.cpp | 7 | ||||
-rw-r--r-- | scumm/scumm.h | 2 |
2 files changed, 7 insertions, 2 deletions
diff --git a/scumm/script_v6.cpp b/scumm/script_v6.cpp index 73ec5bb1e0..35dc7a7292 100644 --- a/scumm/script_v6.cpp +++ b/scumm/script_v6.cpp @@ -2958,7 +2958,12 @@ void ScummEngine_v6::o6_stampObject() { int objnum = getObjectIndex(object); if (objnum == -1) return; - setObjectState(object, state, x, y); + if (objnum != -1) { + _objs[objnum].x_pos = x * 8; + _objs[objnum].y_pos = y * 8; + } + putState(object, state); + drawObject(objnum, 0); warning("o6_stampObject: (%d at (%d,%d) state %d)", object, x, y, state); diff --git a/scumm/scumm.h b/scumm/scumm.h index ae33c3a2ac..2023f06b28 100644 --- a/scumm/scumm.h +++ b/scumm/scumm.h @@ -913,7 +913,7 @@ protected: void removeBlastObject(BlastObject *eo); int _drawObjectQueNr; - byte _drawObjectQue[700]; + byte _drawObjectQue[200]; byte _palManipStart, _palManipEnd; uint16 _palManipCounter; byte *_palManipPalette; |