diff options
| author | Arnaud Boutonné | 2010-06-24 11:50:25 +0000 |
|---|---|---|
| committer | Arnaud Boutonné | 2010-06-24 11:50:25 +0000 |
| commit | 9a3ef9b8e17151993c9b1a6f79fd97ec058a4cc9 (patch) | |
| tree | 4726c0a696650d496571f1d21508bd337c5f9f83 /engines | |
| parent | afffcec96ec03a0e39d692080849e2e36722637a (diff) | |
| download | scummvm-rg350-9a3ef9b8e17151993c9b1a6f79fd97ec058a4cc9.tar.gz scummvm-rg350-9a3ef9b8e17151993c9b1a6f79fd97ec058a4cc9.tar.bz2 scummvm-rg350-9a3ef9b8e17151993c9b1a6f79fd97ec058a4cc9.zip | |
Initialize properly paramCount in gob1. This fixes several valgrind errors, and the unknown opcodes are now skipped as expected. (related to bug #3018918, only partially solved)
svn-id: r50209
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/gob/inter_v1.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/engines/gob/inter_v1.cpp b/engines/gob/inter_v1.cpp index 805893d8a7..b35e0b8a82 100644 --- a/engines/gob/inter_v1.cpp +++ b/engines/gob/inter_v1.cpp @@ -1331,7 +1331,8 @@ bool Inter_v1::o1_goblinFunc(OpFuncParams ¶ms) { gobParams.retVarPtr.set(*_variables, 236); cmd = _vm->_game->_script->readInt16(); - _vm->_game->_script->skip(2); + gobParams.paramCount = _vm->_game->_script->readInt16(); + if ((cmd > 0) && (cmd < 17)) { objDescSet = true; gobParams.extraData = _vm->_game->_script->readInt16(); |