aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaweł Kołodziejski2003-06-07 04:24:57 +0000
committerPaweł Kołodziejski2003-06-07 04:24:57 +0000
commit0c85e713ac01c991d9155683340e0dd5e7caf750 (patch)
treea93eb0b59c7b9359dbd5238504aba356227dbc7d
parent49b9a8fc9d999b82c3e694a6da672b259089fe97 (diff)
downloadscummvm-rg350-0c85e713ac01c991d9155683340e0dd5e7caf750.tar.gz
scummvm-rg350-0c85e713ac01c991d9155683340e0dd5e7caf750.tar.bz2
scummvm-rg350-0c85e713ac01c991d9155683340e0dd5e7caf750.zip
init costumes for v1 games
svn-id: r8378
-rw-r--r--scumm/script_v2.cpp9
-rw-r--r--scumm/scummvm.cpp4
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;