diff options
| author | Travis Howell | 2004-10-17 06:07:45 +0000 |
|---|---|---|
| committer | Travis Howell | 2004-10-17 06:07:45 +0000 |
| commit | eaa65d57dd9d45eb7eef7bd8e7f5fdd4fd54f993 (patch) | |
| tree | 33402bf1ce2e040a9edd086e4e81fb6cfeee4fc4 | |
| parent | 4667a12c9d071df2f086773f6cad8686649cf630 (diff) | |
| download | scummvm-rg350-eaa65d57dd9d45eb7eef7bd8e7f5fdd4fd54f993.tar.gz scummvm-rg350-eaa65d57dd9d45eb7eef7bd8e7f5fdd4fd54f993.tar.bz2 scummvm-rg350-eaa65d57dd9d45eb7eef7bd8e7f5fdd4fd54f993.zip | |
Check if VAR_WIZ_TCOLOR is set, before using it.
BMAP images are only used in HE71+.
svn-id: r15580
| -rw-r--r-- | scumm/gfx.cpp | 5 | ||||
| -rw-r--r-- | scumm/script_v72he.cpp | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/scumm/gfx.cpp b/scumm/gfx.cpp index 779993a8f0..9dd24fb582 100644 --- a/scumm/gfx.cpp +++ b/scumm/gfx.cpp @@ -631,6 +631,11 @@ void ScummEngine::redrawBGAreas() { } void ScummEngine_v70he::redrawBGAreas() { + if (_heversion == 70) { + ScummEngine::redrawBGAreas(); + return; + } + int val = 0; if (camera._cur.x != camera._last.x && _charset->_hasMask) stopTalk(); diff --git a/scumm/script_v72he.cpp b/scumm/script_v72he.cpp index 50426569b4..7244be412b 100644 --- a/scumm/script_v72he.cpp +++ b/scumm/script_v72he.cpp @@ -925,7 +925,7 @@ void ScummEngine_v72he::captureWizImage(int resType, int resNum, const Common::R int w = rCapt.width(); int h = rCapt.height(); - int tColor = VAR(VAR_WIZ_TCOLOR); + int tColor = (VAR_WIZ_TCOLOR != 0xFF) ? VAR(VAR_WIZ_TCOLOR) : 5; // compute compressed size int dataSize = 0; |