diff options
| author | Travis Howell | 2003-08-28 12:21:35 +0000 |
|---|---|---|
| committer | Travis Howell | 2003-08-28 12:21:35 +0000 |
| commit | cf4ae4097fcddb3fdfd0e1f5104312d4f5dc673e (patch) | |
| tree | 53a56faed7055e49089f493264ecb32b8b81e8b0 /scumm/string.cpp | |
| parent | 0a7dd227b8296446d743aa9c5b32fb2d0ab72881 (diff) | |
| download | scummvm-rg350-cf4ae4097fcddb3fdfd0e1f5104312d4f5dc673e.tar.gz scummvm-rg350-cf4ae4097fcddb3fdfd0e1f5104312d4f5dc673e.tar.bz2 scummvm-rg350-cf4ae4097fcddb3fdfd0e1f5104312d4f5dc673e.zip | |
Update warnings in mingw makefile.
Add hack to allow nosubtitles in loomcd (Only once game has started)
Revert _roomPalette changes for 256 colors games, caused problems in loomcd, I'm not sure the older 256 color needs these changes.
svn-id: r9890
Diffstat (limited to 'scumm/string.cpp')
| -rw-r--r-- | scumm/string.cpp | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/scumm/string.cpp b/scumm/string.cpp index 2697455bf3..5f39617eee 100644 --- a/scumm/string.cpp +++ b/scumm/string.cpp @@ -16,7 +16,11 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * +<<<<<<< string.cpp * $Header$ +======= + * $Header$ +>>>>>>> 1.153 * */ @@ -310,7 +314,10 @@ void Scumm::CHARSET_1() { if (_version <= 3) { _charset->printChar(c); } else { - if (_noSubtitles && (_haveMsg == 0xFE || _sound->_talkChannelHandle)) { + if ((_gameId == GID_LOOM256) && _noSubtitles) { + // FIXME Special case for loomcd, since it only uses CD audio.for sound + // We need a way to check if CD audio is been used + } else if (_noSubtitles && (_haveMsg == 0xFE || _sound->_talkChannelHandle)) { // Subtitles are turned off, and there is a voice version // of this message -> don't print it. } else |