diff options
| author | Paweł Kołodziejski | 2003-07-20 20:42:58 +0000 |
|---|---|---|
| committer | Paweł Kołodziejski | 2003-07-20 20:42:58 +0000 |
| commit | 25dbf529ab7e83c0e07eb92843e47d18bac7bafd (patch) | |
| tree | cb5b9cae8b08816e95887153801eb250b2374143 /scumm | |
| parent | e25be8327ae124b5ada06e1fa20cf0b4ee1e1356 (diff) | |
| download | scummvm-rg350-25dbf529ab7e83c0e07eb92843e47d18bac7bafd.tar.gz scummvm-rg350-25dbf529ab7e83c0e07eb92843e47d18bac7bafd.tar.bz2 scummvm-rg350-25dbf529ab7e83c0e07eb92843e47d18bac7bafd.zip | |
some changes for stampObject opcode to be more similiar dissassembly
svn-id: r9098
Diffstat (limited to 'scumm')
| -rw-r--r-- | scumm/script_v6.cpp | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/scumm/script_v6.cpp b/scumm/script_v6.cpp index a6f3b03183..ae5fa5ce4e 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() { |