thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update warnings in mingw makefile.

Browse source 
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
This commit is contained in:
Travis Howell 2003-08-28 12:21:35 +00:00
parent 0a7dd227b8
commit cf4ae4097f
4 changed files with 24 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

9
scumm/string.cpp
View file

@ -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