diff options
author | Nicola Mettifogo | 2007-09-19 08:40:12 +0000 |
---|---|---|
committer | Nicola Mettifogo | 2007-09-19 08:40:12 +0000 |
commit | 258901bab96f0050385a9912c8ea0fe2a41b2d6f (patch) | |
tree | a3ae8675b679c9f3b58ac8d97c79369502ea23c1 /engines/scumm/sound.cpp | |
parent | a89694c0d61a75a960f5bec6c498659c988401cc (diff) | |
download | scummvm-rg350-258901bab96f0050385a9912c8ea0fe2a41b2d6f.tar.gz scummvm-rg350-258901bab96f0050385a9912c8ea0fe2a41b2d6f.tar.bz2 scummvm-rg350-258901bab96f0050385a9912c8ea0fe2a41b2d6f.zip |
Merged common/stdafx.h into common/scummsys.h. All referencing files have been updated.
svn-id: r28966
Diffstat (limited to 'engines/scumm/sound.cpp')
-rw-r--r-- | engines/scumm/sound.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/engines/scumm/sound.cpp b/engines/scumm/sound.cpp index 62f65c22c1..c33f1130fd 100644 --- a/engines/scumm/sound.cpp +++ b/engines/scumm/sound.cpp @@ -23,7 +23,7 @@ * */ -#include "common/stdafx.h" + #include "scumm/actor.h" #include "scumm/file.h" #include "scumm/imuse/imuse.h" @@ -200,7 +200,7 @@ void Sound::playSound(int soundID) { else if (READ_BE_UINT32(ptr) == 0x460e200d) { // This sound resource occurs in the Macintosh version of Monkey Island. // I do now know whether it is used in any place other than the one - // mentioned in the bug report above; in case it is, I put a check here. + // mentioned in the bug report above; in case it is, I put a check here. assert(soundID == 39); // The samplerate is copied from the sound resouce 39 of the PC CD/VGA @@ -927,7 +927,7 @@ BaseScummFile *Sound::openSfxFile() { Common::String basename[2]; Common::String tmp; - + const char *ptr = strchr(_vm->_filenamePattern.pattern, '.'); if (ptr) { basename[0] = Common::String(_vm->_filenamePattern.pattern, ptr - _vm->_filenamePattern.pattern + 1); |