diff options
| author | Travis Howell | 2006-03-26 09:21:07 +0000 |
|---|---|---|
| committer | Travis Howell | 2006-03-26 09:21:07 +0000 |
| commit | 26c0d2b4fa995def7add48d57028b6644779b915 (patch) | |
| tree | ee7ae5c351e25f067454a08b0c525d50e47a3108 | |
| parent | 59dd971a02dfa875cfa8c476b505f99f95b68afa (diff) | |
| download | scummvm-rg350-26c0d2b4fa995def7add48d57028b6644779b915.tar.gz scummvm-rg350-26c0d2b4fa995def7add48d57028b6644779b915.tar.bz2 scummvm-rg350-26c0d2b4fa995def7add48d57028b6644779b915.zip | |
Always use the correct string slot for HE games specific cases in decodeParseString()
svn-id: r21462
| -rw-r--r-- | engines/scumm/he/script_v100he.cpp | 4 | ||||
| -rw-r--r-- | engines/scumm/he/script_v60he.cpp | 2 | ||||
| -rw-r--r-- | engines/scumm/he/script_v72he.cpp | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/engines/scumm/he/script_v100he.cpp b/engines/scumm/he/script_v100he.cpp index 7f38ef5423..1ccdeb2f9e 100644 --- a/engines/scumm/he/script_v100he.cpp +++ b/engines/scumm/he/script_v100he.cpp @@ -2937,7 +2937,7 @@ void ScummEngine_v100he::decodeParseString(int m, int n) { push(colors); getStackList(args, ARRAYSIZE(args)); for (i = 0; i < 16; i++) - _charsetColorMap[i] = _charsetData[_string[1]._default.charset][i] = (unsigned char)args[i]; + _charsetColorMap[i] = _charsetData[_string[m]._default.charset][i] = (unsigned char)args[i]; _string[m].color = _charsetColorMap[0]; } break; @@ -2975,7 +2975,7 @@ void ScummEngine_v100he::decodeParseString(int m, int n) { _actorToPrintStrFor = pop(); if (_actorToPrintStrFor != 0xFF) { a = derefActor(_actorToPrintStrFor, "decodeParseString"); - _string[0].color = a->_talkColor; + _string[m].color = a->_talkColor; } } break; diff --git a/engines/scumm/he/script_v60he.cpp b/engines/scumm/he/script_v60he.cpp index 0ccb12555b..6d562cc163 100644 --- a/engines/scumm/he/script_v60he.cpp +++ b/engines/scumm/he/script_v60he.cpp @@ -1301,7 +1301,7 @@ void ScummEngine_v60he::decodeParseString(int m, int n) { push(colors); getStackList(args, ARRAYSIZE(args)); for (i = 0; i < 16; i++) - _charsetColorMap[i] = _charsetData[_string[1]._default.charset][i] = (unsigned char)args[i]; + _charsetColorMap[i] = _charsetData[_string[m]._default.charset][i] = (unsigned char)args[i]; _string[m].color = _charsetColorMap[0]; } break; diff --git a/engines/scumm/he/script_v72he.cpp b/engines/scumm/he/script_v72he.cpp index 154fbfbda9..741167e228 100644 --- a/engines/scumm/he/script_v72he.cpp +++ b/engines/scumm/he/script_v72he.cpp @@ -2302,7 +2302,7 @@ void ScummEngine_v72he::decodeParseString(int m, int n) { push(colors); getStackList(args, ARRAYSIZE(args)); for (i = 0; i < 16; i++) - _charsetColorMap[i] = _charsetData[_string[1]._default.charset][i] = (unsigned char)args[i]; + _charsetColorMap[i] = _charsetData[_string[m]._default.charset][i] = (unsigned char)args[i]; _string[m].color = _charsetColorMap[0]; } break; @@ -2312,7 +2312,7 @@ void ScummEngine_v72he::decodeParseString(int m, int n) { _actorToPrintStrFor = pop(); if (_actorToPrintStrFor != 0xFF) { a = derefActor(_actorToPrintStrFor, "decodeParseString"); - _string[0].color = a->_talkColor; + _string[m].color = a->_talkColor; } } break; |