aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTravis Howell2003-08-17 12:13:17 +0000
committerTravis Howell2003-08-17 12:13:17 +0000
commitd343ef10b3b5b4ca75feb2ab1ddbab19ecca9d8b (patch)
tree3345a9f4ed3da8caad049f4455e9583bf0d3201b
parentbe2e79624719a20a72f3d650115c6365d3753841 (diff)
downloadscummvm-rg350-d343ef10b3b5b4ca75feb2ab1ddbab19ecca9d8b.tar.gz
scummvm-rg350-d343ef10b3b5b4ca75feb2ab1ddbab19ecca9d8b.tar.bz2
scummvm-rg350-d343ef10b3b5b4ca75feb2ab1ddbab19ecca9d8b.zip
Remove c64_ignorePakCols calls for v1 games, since they cause crashes and don't seem to be required.
Makes v1 maniac completable, maybe v1 zak too. svn-id: r9736
-rw-r--r--scumm/costume.cpp16
1 files changed, 4 insertions, 12 deletions
diff --git a/scumm/costume.cpp b/scumm/costume.cpp
index d04df22147..2bfbb43e65 100644
--- a/scumm/costume.cpp
+++ b/scumm/costume.cpp
@@ -208,13 +208,9 @@ byte CostumeRenderer::mainRoutine(int xmoveCur, int ymoveCur) {
if (!use_scaling)
skip = -v1.x;
if (skip > 0) {
- if (!newAmiCost) {
+ if (!newAmiCost && _vm->_version > 1) {
v1.skip_width -= skip;
-
- if (_loaded._format == 0x57)
- c64_ignorePakCols(skip);
- else
- codec1_ignorePakCols(skip);
+ codec1_ignorePakCols(skip);
v1.x = 0;
}
} else {
@@ -229,13 +225,9 @@ byte CostumeRenderer::mainRoutine(int xmoveCur, int ymoveCur) {
if (!use_scaling)
skip = x_right - _vm->_screenWidth;
if (skip > 0) {
- if (!newAmiCost) {
+ if (!newAmiCost && _vm->_version > 1) {
v1.skip_width -= skip;
-
- if (_loaded._format == 0x57)
- c64_ignorePakCols(skip);
- else
- codec1_ignorePakCols(skip);
+ codec1_ignorePakCols(skip);
v1.x = _vm->_screenWidth - 1;
}
} else {