diff options
| author | Travis Howell | 2004-10-17 13:14:21 +0000 |
|---|---|---|
| committer | Travis Howell | 2004-10-17 13:14:21 +0000 |
| commit | c823af303acb25b70373ce97fe334a1546804a91 (patch) | |
| tree | c19e354a84bb8715762dd31b99e9762fac96a485 | |
| parent | 4aa211a8e05600b22cbad1aa5fba527432989b78 (diff) | |
| download | scummvm-rg350-c823af303acb25b70373ce97fe334a1546804a91.tar.gz scummvm-rg350-c823af303acb25b70373ce97fe334a1546804a91.tar.bz2 scummvm-rg350-c823af303acb25b70373ce97fe334a1546804a91.zip | |
Color correction for HE70+ strings.
svn-id: r15586
| -rw-r--r-- | scumm/script_v6he.cpp | 10 | ||||
| -rw-r--r-- | scumm/script_v72he.cpp | 10 |
2 files changed, 10 insertions, 10 deletions
diff --git a/scumm/script_v6he.cpp b/scumm/script_v6he.cpp index a550e12219..bcac573eea 100644 --- a/scumm/script_v6he.cpp +++ b/scumm/script_v6he.cpp @@ -1272,7 +1272,7 @@ void ScummEngine_v60he::redimArray(int arrayId, int newX, int newY, int type) { void ScummEngine_v60he::decodeParseString(int m, int n) { byte b; - int i, color; + int i, colors; int args[31]; b = fetchScriptByte(); @@ -1312,15 +1312,15 @@ void ScummEngine_v60he::decodeParseString(int m, int n) { _scriptPointer += resStrLen(_scriptPointer) + 1; break; case 0xF9: - color = pop(); - if (color == 1) { + colors = pop(); + if (colors == 1) { _string[m].color = pop(); } else { - push(color); + push(colors); getStackList(args, ARRAYSIZE(args)); for (i = 0; i < 16; i++) _charsetColorMap[i] = _charsetData[_string[1]._default.charset][i] = (unsigned char)args[i]; - _string[m].color = color; + _string[m].color = _charsetColorMap[0]; } break; case 0xFE: diff --git a/scumm/script_v72he.cpp b/scumm/script_v72he.cpp index f4faf895ab..781df21ce7 100644 --- a/scumm/script_v72he.cpp +++ b/scumm/script_v72he.cpp @@ -2528,7 +2528,7 @@ void ScummEngine_v72he::o72_setWindowCaption() { } void ScummEngine_v72he::decodeParseString(int m, int n) { - int i, color, size; + int i, colors, size; int args[31]; byte name[1024]; @@ -2582,15 +2582,15 @@ void ScummEngine_v72he::decodeParseString(int m, int n) { } break; case 0xF9: - color = pop(); - if (color == 1) { + colors = pop(); + if (colors == 1) { _string[m].color = pop(); } else { - push(color); + push(colors); getStackList(args, ARRAYSIZE(args)); for (i = 0; i < 16; i++) _charsetColorMap[i] = _charsetData[_string[1]._default.charset][i] = (unsigned char)args[i]; - _string[m].color = color; + _string[m].color = _charsetColorMap[0]; } break; case 0xFE: |