diff options
-rw-r--r-- | scumm/actor.cpp | 2 | ||||
-rw-r--r-- | scumm/script_v6.cpp | 13 |
2 files changed, 6 insertions, 9 deletions
diff --git a/scumm/actor.cpp b/scumm/actor.cpp index cac91c4c86..8b6f0b5d9f 100644 --- a/scumm/actor.cpp +++ b/scumm/actor.cpp @@ -1643,8 +1643,6 @@ void Actor::remapActorPaletteColor(int color, int new_color) { return; } } - - warning("Color %d not found in actor %d", color, number); } void Actor::remapActorPalette(int r_fact, int g_fact, int b_fact, int threshold) { diff --git a/scumm/script_v6.cpp b/scumm/script_v6.cpp index 6baf5d1c6f..3c6dc49288 100644 --- a/scumm/script_v6.cpp +++ b/scumm/script_v6.cpp @@ -1921,12 +1921,13 @@ void ScummEngine_v6::o6_actorOps() { a->drawActorCostume(); a->needRedraw = false; - if (a->top < top_actor) { - a->bottom = top_actor; - } - if (a->bottom > bottom_actor) { + if (a->top > top_actor) + a->top = top_actor; + if (a->bottom < bottom_actor) a->bottom = bottom_actor; - } + + //FIXME Trigger redraw + a->bottom = top_actor; } break; case 227: // SO_ACTOR_DEPTH @@ -3191,11 +3192,9 @@ void ScummEngine_v6::o6_writeFile() { // Humongous Entertainment games only void ScummEngine_v6::o6_findAllObjects() { - // FIXME verifty correctness of this opcode int a = pop(); int i = 1; - warning("stub o6_findAllObjects(%d)", a); if (a != _currentRoom) warning("o6_findAllObjects: current room is not %d", a); writeVar(0, 0); |