aboutsummaryrefslogtreecommitdiff
path: root/scumm
diff options
context:
space:
mode:
authorTravis Howell2003-08-11 03:45:12 +0000
committerTravis Howell2003-08-11 03:45:12 +0000
commit0e831751bc32a0f41448100d071b3cf8e3e1bddc (patch)
tree7d7e3a82faf3b0cd7a0d5ec43c56dde2e2448934 /scumm
parentf3ec42c59679baba0474e86b1114955e729b36cf (diff)
downloadscummvm-rg350-0e831751bc32a0f41448100d071b3cf8e3e1bddc.tar.gz
scummvm-rg350-0e831751bc32a0f41448100d071b3cf8e3e1bddc.tar.bz2
scummvm-rg350-0e831751bc32a0f41448100d071b3cf8e3e1bddc.zip
Fix a regression, this code is required for Amiga versions!
Fixes some brief costume distortions svn-id: r9633
Diffstat (limited to 'scumm')
-rw-r--r--scumm/costume.cpp28
1 files changed, 16 insertions, 12 deletions
diff --git a/scumm/costume.cpp b/scumm/costume.cpp
index fbe2b05e70..e36240dc2d 100644
--- a/scumm/costume.cpp
+++ b/scumm/costume.cpp
@@ -205,13 +205,15 @@ byte CostumeRenderer::mainRoutine(int xmoveCur, int ymoveCur) {
if (!use_scaling)
skip = -v1.x;
if (skip > 0) {
- v1.skip_width -= skip;
+ if (!(_vm->_features & GF_AMIGA)) {
+ v1.skip_width -= skip;
- if (_loaded._format == 0x57)
- c64_ignorePakCols(skip);
- else
- codec1_ignorePakCols(skip);
- v1.x = 0;
+ if (_loaded._format == 0x57)
+ c64_ignorePakCols(skip);
+ else
+ codec1_ignorePakCols(skip);
+ v1.x = 0;
+ }
} else {
skip = x_right - _vm->_screenWidth;
if (skip <= 0) {
@@ -224,13 +226,15 @@ byte CostumeRenderer::mainRoutine(int xmoveCur, int ymoveCur) {
if (!use_scaling)
skip = x_right - _vm->_screenWidth;
if (skip > 0) {
- v1.skip_width -= skip;
+ if (!(_vm->_features & GF_AMIGA)) {
+ v1.skip_width -= skip;
- if (_loaded._format == 0x57)
- c64_ignorePakCols(skip);
- else
- codec1_ignorePakCols(skip);
- v1.x = _vm->_screenWidth - 1;
+ if (_loaded._format == 0x57)
+ c64_ignorePakCols(skip);
+ else
+ codec1_ignorePakCols(skip);
+ v1.x = _vm->_screenWidth - 1;
+ }
} else {
skip = -1 - x_left;
if (skip <= 0)