diff options
| author | Travis Howell | 2003-12-01 00:54:50 +0000 |
|---|---|---|
| committer | Travis Howell | 2003-12-01 00:54:50 +0000 |
| commit | 28f9c34f8c111cf3841b50feb88669ce29e73076 (patch) | |
| tree | c80b2cc66fc35c97b6e1d5377fb828319ef697a1 /simon | |
| parent | 242efda7fb8260fbd2120e2e7fc22de2b12bb371 (diff) | |
| download | scummvm-rg350-28f9c34f8c111cf3841b50feb88669ce29e73076.tar.gz scummvm-rg350-28f9c34f8c111cf3841b50feb88669ce29e73076.tar.bz2 scummvm-rg350-28f9c34f8c111cf3841b50feb88669ce29e73076.zip | |
Might as well combine these two.
svn-id: r11440
Diffstat (limited to 'simon')
| -rw-r--r-- | simon/simon.cpp | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/simon/simon.cpp b/simon/simon.cpp index f4f333c8cd..372fea5b91 100644 --- a/simon/simon.cpp +++ b/simon/simon.cpp @@ -3993,13 +3993,7 @@ void SimonEngine::talk_with_text(uint vga_sprite_id, uint color, const char *str len_div_3 = (strlen(string_ptr) + 3) / 3; - if (_game & GF_SIMON2) { - if (_variableArray[86] == 0) - len_div_3 >>= 1; - if (_variableArray[86] == 2) - len_div_3 <<= 1; - _variableArray[85] = len_div_3 * 5; - } else if (_game & GF_TALKIE) { + if (!(_game & GF_SIMON2) && (_game & GF_TALKIE)) { if (_variableArray[141] == 0) _variableArray[141] = 9; _variableArray[85] = _variableArray[141] * len_div_3; |