aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTravis Howell2004-01-20 00:21:24 +0000
committerTravis Howell2004-01-20 00:21:24 +0000
commitb8e739ae3d6d6e3ee61b5c1e67e29ee13c60410c (patch)
tree9646a5238c304d9f66487d355b017299b8a831b5
parent698eefae58b5ff065fc777b28530a3d77e5f9933 (diff)
downloadscummvm-rg350-b8e739ae3d6d6e3ee61b5c1e67e29ee13c60410c.tar.gz
scummvm-rg350-b8e739ae3d6d6e3ee61b5c1e67e29ee13c60410c.tar.bz2
scummvm-rg350-b8e739ae3d6d6e3ee61b5c1e67e29ee13c60410c.zip
Add newline
Prevent overlapping speech in dig. svn-id: r12530
-rw-r--r--scumm/imuse_digi/dimuse.h2
-rw-r--r--scumm/sound.cpp6
2 files changed, 5 insertions, 3 deletions
diff --git a/scumm/imuse_digi/dimuse.h b/scumm/imuse_digi/dimuse.h
index d479d3a932..869bf6a79b 100644
--- a/scumm/imuse_digi/dimuse.h
+++ b/scumm/imuse_digi/dimuse.h
@@ -213,4 +213,4 @@ extern const imuseFtNames _ftSeqNames[];
} // End of namespace Scumm
-#endif \ No newline at end of file
+#endif
diff --git a/scumm/sound.cpp b/scumm/sound.cpp
index 5b7b7d13d3..b66c70a406 100644
--- a/scumm/sound.cpp
+++ b/scumm/sound.cpp
@@ -465,9 +465,11 @@ void Sound::startTalkSound(uint32 offset, uint32 b, int mode, PlayingSoundHandle
if (_vm->_gameId == GID_CMI) {
_sfxMode |= mode;
return;
- }
+ } else if (_vm->_gameId == GID_DIG) {
+ _sfxMode |= mode;
+ if (!(_vm->_features & GF_DEMO))
+ return;
- if ((_vm->_gameId == GID_DIG) && (_vm->_features & GF_DEMO)) {
char filename[30];
char roomname[10];