diff options
| -rw-r--r-- | scumm/script_v100he.cpp | 47 | ||||
| -rw-r--r-- | scumm/scumm.h | 2 | ||||
| -rw-r--r-- | scumm/string.cpp | 4 |
3 files changed, 6 insertions, 47 deletions
diff --git a/scumm/script_v100he.cpp b/scumm/script_v100he.cpp index 88ab4436b8..8a9c3e8a11 100644 --- a/scumm/script_v100he.cpp +++ b/scumm/script_v100he.cpp @@ -1858,20 +1858,7 @@ void ScummEngine_v100he::decodeParseString(int m, int n) { break; case 35: decodeScriptString(name, true); - switch (m) { - case 0: - actorTalk(name); - break; - case 1: - drawString(1, name); - break; - case 2: - unkMessage1(name); - break; - case 3: - unkMessage2(name); - break; - } + printString(m, name); break; case 46: // SO_LEFT _string[m].center = false; @@ -1888,39 +1875,11 @@ void ScummEngine_v100he::decodeParseString(int m, int n) { ptr = getResourceAddress(rtTalkie, pop()); size = READ_BE_UINT32(ptr + 12); memcpy(name, ptr + 16, size); - - switch (m) { - case 0: - actorTalk(name); - break; - case 1: - drawString(1, name); - break; - case 2: - unkMessage1(name); - break; - case 3: - unkMessage2(name); - break; - } + printString(m, name); break; case 79: // SO_TEXTSTRING - switch (m) { - case 0: - actorTalk(_scriptPointer); - break; - case 1: - drawString(1, _scriptPointer); - break; - case 2: - unkMessage1(_scriptPointer); - break; - case 3: - unkMessage2(_scriptPointer); - break; - } + printString(m, _scriptPointer); _scriptPointer += resStrLen(_scriptPointer) + 1; - break; case 91: _string[m].loadDefault(); diff --git a/scumm/scumm.h b/scumm/scumm.h index 4363a996f5..881a7bf6e4 100644 --- a/scumm/scumm.h +++ b/scumm/scumm.h @@ -1157,7 +1157,7 @@ protected: void CHARSET_1(); void drawString(int a, const byte *msg); void unkMessage1(const byte *msg); - void unkMessage2(const byte *msg); + void showMessageDialog(const byte *msg); int addMessageToStack(const byte *msg, byte *dst, int dstSize); int addIntToStack(byte *dst, int dstSize, int var); diff --git a/scumm/string.cpp b/scumm/string.cpp index 362864acff..71c3987b47 100644 --- a/scumm/string.cpp +++ b/scumm/string.cpp @@ -46,7 +46,7 @@ void ScummEngine::printString(int m, const byte *msg) { unkMessage1(msg); break; case 3: - unkMessage2(msg); + showMessageDialog(msg); break; } } @@ -79,7 +79,7 @@ void ScummEngine::unkMessage1(const byte *msg) { } } -void ScummEngine::unkMessage2(const byte *msg) { +void ScummEngine::showMessageDialog(const byte *msg) { // Original COMI used different code at this point. // Seemed to use blastText for the messages byte buf[100]; |