diff options
| -rw-r--r-- | scumm/script_v2.cpp | 9 | ||||
| -rw-r--r-- | scumm/scummvm.cpp | 4 |
2 files changed, 4 insertions, 9 deletions
diff --git a/scumm/script_v2.cpp b/scumm/script_v2.cpp index 6429e9fe6b..5b37c7fb59 100644 --- a/scumm/script_v2.cpp +++ b/scumm/script_v2.cpp @@ -683,15 +683,6 @@ void Scumm_v2::o2_actorSet() { switch (_opcode) { case 1: // Actor Sound a->sound[0] = arg; - -#if 0 - // FIXME: This hack would make costume draw. However, until - // we have added support for the V1 costume format, this hurts - // more than it helps. - if (_version == 1 && vm.slot[_currentScript].number == 1) { - a->setActorCostume(act); - } -#endif break; case 2: // Actor Set Color diff --git a/scumm/scummvm.cpp b/scumm/scummvm.cpp index f18986ff4f..6460b2172c 100644 --- a/scumm/scummvm.cpp +++ b/scumm/scummvm.cpp @@ -819,6 +819,10 @@ void Scumm::scummInit() { for (i = 1; i < _numActors; i++) { _actors[i].number = i; _actors[i].initActor(1); + + // this is from IDB + if (_version == 1) + _actors[i].costume = i; } _numNestedScripts = 0; |