From 25dbf529ab7e83c0e07eb92843e47d18bac7bafd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20Ko=C5=82odziejski?= Date: Sun, 20 Jul 2003 20:42:58 +0000 Subject: [PATCH] some changes for stampObject opcode to be more similiar dissassembly svn-id: r9098 --- scumm/script_v6.cpp | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/scumm/script_v6.cpp b/scumm/script_v6.cpp index a6f3b031839..ae5fa5ce4e7 100644 --- a/scumm/script_v6.cpp +++ b/scumm/script_v6.cpp @@ -2787,9 +2787,6 @@ void Scumm_v6::o6_stampObject() { int object, x, y, state; state = pop(); - if (state == 0) { - state = 1; - } y = pop(); x = pop(); object = pop(); @@ -2806,10 +2803,16 @@ void Scumm_v6::o6_stampObject() { // drawActor(object, mainBufferPtr, x_y, scale_x_y); return; } + + if (object == 0) { + state = 1; + } - warning("o6_stampObject: (%d at (%d,%d) state %d)", object, x, y, state); - setObjectState(object, state, x, y); - drawObject(getObjectIndex(object), 0); + if (x != -1) { + setObjectState(object, state, x, y); + drawObject(getObjectIndex(object), 0); + warning("o6_stampObject: (%d at (%d,%d) state %d)", object, x, y, state); + } } void Scumm_v6::o6_stopTalking() {