diff options
| author | Max Horn | 2004-09-18 20:50:15 +0000 |
|---|---|---|
| committer | Max Horn | 2004-09-18 20:50:15 +0000 |
| commit | 3552024aa97d07f634aece9b43b36ffc3ddbc068 (patch) | |
| tree | f1a239782e23a06593e217380d5cd76331611eae /scumm/script_v5.cpp | |
| parent | 58c574d7cc82ff342d9f176d60ef6236e9d7926b (diff) | |
| download | scummvm-rg350-3552024aa97d07f634aece9b43b36ffc3ddbc068.tar.gz scummvm-rg350-3552024aa97d07f634aece9b43b36ffc3ddbc068.tar.bz2 scummvm-rg350-3552024aa97d07f634aece9b43b36ffc3ddbc068.zip | |
Added ScummEngine::printString() convenience method; changed enqueueText to call addMessageToStack
svn-id: r15170
Diffstat (limited to 'scumm/script_v5.cpp')
| -rw-r--r-- | scumm/script_v5.cpp | 17 |
1 files changed, 1 insertions, 16 deletions
diff --git a/scumm/script_v5.cpp b/scumm/script_v5.cpp index 96625e2e09..017f9baaee 100644 --- a/scumm/script_v5.cpp +++ b/scumm/script_v5.cpp @@ -2608,7 +2608,6 @@ int ScummEngine_v5::getWordVararg(int *ptr) { void ScummEngine_v5::decodeParseString() { int textSlot; - const byte *msg; switch (_actorToPrintStrFor) { case 252: @@ -2691,23 +2690,9 @@ void ScummEngine_v5::decodeParseString() { } break; case 15: // SO_TEXTSTRING - msg = _scriptPointer; + printString(textSlot, _scriptPointer); _scriptPointer += resStrLen(_scriptPointer) + 1; - switch (textSlot) { - case 0: - actorTalk(msg); - break; - case 1: - drawString(1, msg); - break; - case 2: - unkMessage1(msg); - break; - case 3: - unkMessage2(msg); - break; - } // In SCUMM V1-V3, there were no 'default' values for the text slot // values. Hence to achieve correct behaviour, we have to keep the |