diff options
| author | Travis Howell | 2004-08-26 10:51:11 +0000 |
|---|---|---|
| committer | Travis Howell | 2004-08-26 10:51:11 +0000 |
| commit | 6384093878c6197efa440a1e8efb4b29fd53d870 (patch) | |
| tree | 03e724db2fbbb84e88c9dcc420ea1062df8f8754 | |
| parent | 79fb54ba29c42ce1fabfb623bbc3a7782f15bd20 (diff) | |
| download | scummvm-rg350-6384093878c6197efa440a1e8efb4b29fd53d870.tar.gz scummvm-rg350-6384093878c6197efa440a1e8efb4b29fd53d870.tar.bz2 scummvm-rg350-6384093878c6197efa440a1e8efb4b29fd53d870.zip | |
HE 7.2 games use @ as charset code
Small sound fix
svn-id: r14767
| -rw-r--r-- | scumm/sound.cpp | 2 | ||||
| -rw-r--r-- | scumm/string.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/scumm/sound.cpp b/scumm/sound.cpp index f70fb16034..361ffb92a1 100644 --- a/scumm/sound.cpp +++ b/scumm/sound.cpp @@ -751,7 +751,7 @@ int Sound::isSoundRunning(int sound) const { // getSoundStatus(), with a -1, will return the // ID number of the first active music it finds. if (_currentMusic) - return (_musicChannelHandle.isActive()) ? _currentMusic : 0; + return (_musicChannelHandle.isActive()) ? 1 : 0; else return _vm->_imuse->getSoundStatus(sound); } diff --git a/scumm/string.cpp b/scumm/string.cpp index 16275d3b35..f0a9ce16aa 100644 --- a/scumm/string.cpp +++ b/scumm/string.cpp @@ -512,7 +512,7 @@ int ScummEngine::addMessageToStack(const byte *msg, byte *dst, int dstSize) { num += (_version == 8) ? 4 : 2; } } else { - if (chr != '@') { + if (!(chr == '@' && _heversion <= 71)) { *dst++ = chr; } } |