diff options
| -rw-r--r-- | scumm/script_v6he.cpp | 29 | ||||
| -rw-r--r-- | scumm/scumm.cpp | 4 |
2 files changed, 8 insertions, 25 deletions
diff --git a/scumm/script_v6he.cpp b/scumm/script_v6he.cpp index 1bd60ccb92..a0caedb1c5 100644 --- a/scumm/script_v6he.cpp +++ b/scumm/script_v6he.cpp @@ -45,9 +45,6 @@ namespace Scumm { // FBEAR (fbear, fbeardemo) // transparency in akos.cpp // negative size in file read/write -// PUTTDEMO (puttdemo) -// startSound issue -- check -// actorOps sub 86 -- check #define OPCODE(x) { &ScummEngine_v6he::x, #x } @@ -404,12 +401,9 @@ void ScummEngine_v6he::o6_setState() { } void ScummEngine_v6he::o6_startSound() { - if (_gameId != GID_PUTTDEMO) { - // Seems to range between 952 - 9000 - int offset = pop(); - debug(2, "o6_startSound: offset %d", offset); - } - + // Seems to range between 952 - 9000 + int offset = pop(); + debug(2, "o6_startSound: offset %d", offset); _sound->addSoundToQueue(pop()); } @@ -561,10 +555,6 @@ void ScummEngine_v6he::o6_actorOps() { switch (b) { case 30: - if (_heversion <= 70) { - error("o6_actorOps: default case %d", b); - } - k = pop(); j = pop(); i = pop(); @@ -616,10 +606,7 @@ void ScummEngine_v6he::o6_actorOps() { j = pop(); i = pop(); checkRange(255, 0, i, "Illegal palette slot %d"); - if (_gameId != GID_PUTTDEMO) - a->remapActorPaletteColor(i, j); - else - a->setPalette(i, j); + a->setPalette(i, j); break; case 87: // SO_TALK_COLOR a->talkColor = pop(); @@ -708,12 +695,8 @@ void ScummEngine_v6he::o6_actorOps() { a->needBgReset = true; break; case 225: // SO_ALWAYS_ZCLIP - if (_heversion < 70) { - a->forceClip = pop(); // FIXME: where does this come from? - } else { - i = pop(); // talkie slot - warning("o6_actorOps: stub case %d", b); - } + i = pop(); // talkie slot + warning("o6_actorOps: stub case %d", b); break; default: error("o6_actorOps: default case %d", b); diff --git a/scumm/scumm.cpp b/scumm/scumm.cpp index 4cc52e255b..f8a7bfa30e 100644 --- a/scumm/scumm.cpp +++ b/scumm/scumm.cpp @@ -194,7 +194,7 @@ static const ScummGameSettings scumm_settings[] = { // Humongous Entertainment Scumm Version 6 {"puttputt", "Putt-Putt Joins The Parade", GID_HEGAME, 6, 60, MDT_ADLIB | MDT_NATIVE, GF_NEW_OPCODES | GF_USE_KEY | GF_HUMONGOUS | GF_NEW_COSTUMES, 0}, - {"puttdemo", "Putt-Putt Joins The Parade (Demo)", GID_PUTTDEMO, 6, 60, MDT_ADLIB | MDT_NATIVE, + {"puttdemo", "Putt-Putt Joins The Parade (Demo)", GID_PUTTDEMO, 6, 0, MDT_ADLIB | MDT_NATIVE, GF_NEW_OPCODES | GF_USE_KEY | GF_HUMONGOUS, 0}, {"moondemo", "Putt-Putt Goes To The Moon (Demo)", GID_HEGAME, 6, 60, MDT_ADLIB | MDT_NATIVE, GF_NEW_OPCODES | GF_USE_KEY | GF_HUMONGOUS | GF_NEW_COSTUMES, 0}, @@ -3026,7 +3026,7 @@ Engine *Engine_SCUMM_create(GameDetector *detector, OSystem *syst) { engine = new ScummEngine_v5(detector, syst, game); break; case 6: - if (game.features & GF_HUMONGOUS) { + if (game.heversion >= 60) { // TODO: probably use another variable with version number #ifndef __PALM_OS__ if (game.heversion >= 70) |