diff options
author | Arnaud Boutonné | 2009-08-27 10:39:04 +0000 |
---|---|---|
committer | Arnaud Boutonné | 2009-08-27 10:39:04 +0000 |
commit | b8fed0dd69ca4e8cb3cda1a4b6eddb2e2a8f8f4e (patch) | |
tree | ac3f6e0812a6159ab443f428ab19e90df6ea7786 /engines | |
parent | 9078ee4e7f22c4318a09a17efc5d756ccdf1bf0f (diff) | |
download | scummvm-rg350-b8fed0dd69ca4e8cb3cda1a4b6eddb2e2a8f8f4e.tar.gz scummvm-rg350-b8fed0dd69ca4e8cb3cda1a4b6eddb2e2a8f8f4e.tar.bz2 scummvm-rg350-b8fed0dd69ca4e8cb3cda1a4b6eddb2e2a8f8f4e.zip |
Playtoons - Modify oPlaytoons_F_1B so that it only warns when the functions is supposed to /really/ do something
svn-id: r43767
Diffstat (limited to 'engines')
-rw-r--r-- | engines/gob/inter_playtoons.cpp | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/engines/gob/inter_playtoons.cpp b/engines/gob/inter_playtoons.cpp index c2de34d07b..5d37e84c71 100644 --- a/engines/gob/inter_playtoons.cpp +++ b/engines/gob/inter_playtoons.cpp @@ -36,6 +36,7 @@ #include "gob/draw.h" #include "gob/game.h" #include "gob/script.h" +#include "gob/hotspots.h" #include "gob/palanim.h" #include "gob/video.h" #include "gob/videoplayer.h" @@ -79,6 +80,8 @@ void Inter_Playtoons::setupOpcodesDraw() { void Inter_Playtoons::setupOpcodesFunc() { Inter_v6::setupOpcodesFunc(); + CLEAROPCODEFUNC(0x3D); + OPCODEFUNC(0x1B, oPlaytoons_F_1B); OPCODEFUNC(0x3F, oPlaytoons_checkData); OPCODEFUNC(0x4D, oPlaytoons_readData); @@ -88,12 +91,12 @@ void Inter_Playtoons::setupOpcodesGob() { } bool Inter_Playtoons::oPlaytoons_F_1B(OpFuncParams ¶ms) { - int16 var1; + int16 shortId; int16 var2; int16 var3; int16 var4; - var1 = _vm->_game->_script->readValExpr(); + shortId = _vm->_game->_script->readValExpr(); var2 = _vm->_game->_script->readValExpr(); _vm->_game->_script->evalExpr(0); @@ -101,8 +104,11 @@ bool Inter_Playtoons::oPlaytoons_F_1B(OpFuncParams ¶ms) { var3 = _vm->_game->_script->readValExpr(); var4 = _vm->_game->_script->readValExpr(); - warning("oPlaytoons_F_1B not handled"); - + if (_vm->_game->_hotspots->searchHotspot(shortId)) + warning("oPlaytoons_F_1B not fully handled"); + warning("shortId %d, var2 %d var3 %d var4 %d", id, var2, var3, var4); +// else +// warning("id not found %d", id);; return false; } |