diff options
| author | Martin Kiewitz | 2009-10-12 15:13:15 +0000 |
|---|---|---|
| committer | Martin Kiewitz | 2009-10-12 15:13:15 +0000 |
| commit | 61ac28abea2a2325fe9253e7439d86897d02cbc1 (patch) | |
| tree | 6d3e04fa75e4c38e21f68f91ab234037bd8fcd60 /engines/sci/engine | |
| parent | 3599ac0b9b60bf05039aab4d6df2c84152ea66cb (diff) | |
| download | scummvm-rg350-61ac28abea2a2325fe9253e7439d86897d02cbc1.tar.gz scummvm-rg350-61ac28abea2a2325fe9253e7439d86897d02cbc1.tar.bz2 scummvm-rg350-61ac28abea2a2325fe9253e7439d86897d02cbc1.zip | |
SCI: kCelHigh / kCelWide got broken with last revision, now fixed
svn-id: r44987
Diffstat (limited to 'engines/sci/engine')
| -rw-r--r-- | engines/sci/engine/kgraphics.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/engines/sci/engine/kgraphics.cpp b/engines/sci/engine/kgraphics.cpp index 35fef54224..cc9d293327 100644 --- a/engines/sci/engine/kgraphics.cpp +++ b/engines/sci/engine/kgraphics.cpp @@ -794,11 +794,11 @@ reg_t kIsItSkip(EngineState *s, int argc, reg_t *argv) { reg_t kCelHigh(EngineState *s, int argc, reg_t *argv) { int view = argv[0].toSint16(); int loop = argv[1].toSint16(); - int cel = (argc > 3) ? argv[2].toSint16() : 0; + int cel = (argc >= 3) ? argv[2].toSint16() : 0; int height, width; Common::Point offset; - if (argc > 4) + if (argc > 3) error("celHigh called with more than 3 parameters"); gfxop_get_cel_parameters(s->gfx_state, view, loop, cel, &width, &height, &offset); @@ -808,11 +808,11 @@ reg_t kCelHigh(EngineState *s, int argc, reg_t *argv) { reg_t kCelWide(EngineState *s, int argc, reg_t *argv) { int view = argv[0].toSint16(); int loop = argv[1].toSint16(); - int cel = (argc > 3) ? argv[2].toSint16() : 0; + int cel = (argc >= 3) ? argv[2].toSint16() : 0; int height, width; Common::Point offset; - if (argc > 4) + if (argc > 3) error("celWide called with more than 3 parameters"); gfxop_get_cel_parameters(s->gfx_state, view, loop, cel, &width, &height, &offset); |