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/kyra/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/kyra/sound.cpp')
| -rw-r--r-- | engines/kyra/sound.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/engines/kyra/sound.cpp b/engines/kyra/sound.cpp index 562754b9c5..20a90c2c32 100644 --- a/engines/kyra/sound.cpp +++ b/engines/kyra/sound.cpp @@ -23,7 +23,7 @@ * */ -#include "common/stdafx.h" + #include "common/system.h" #include "kyra/resource.h" #include "kyra/sound.h" @@ -60,7 +60,7 @@ void Sound::voicePlay(const char *file) { _vm->resource()->getFileHandle(filenamebuffer, &fileSize, _compressHandle); if (!_compressHandle.isOpen()) continue; - + Common::MemoryReadStream *tmp = _compressHandle.readStream(fileSize); assert(tmp); _currentVocFile = _supportedCodes[i].streamFunc(tmp, true, 0, 0, 1); @@ -71,7 +71,7 @@ void Sound::voicePlay(const char *file) { if (!found) { strcpy(filenamebuffer, file); strcat(filenamebuffer, ".VOC"); - + fileData = _vm->resource()->fileData(filenamebuffer, &fileSize); if (!fileData) return; @@ -332,7 +332,7 @@ void SoundMidiPC::stopMusic() { _parser = 0; delete [] _parserSource; _parserSource = 0; - + _fadeStartTime = 0; _fadeMusicOut = false; setVolume(255); @@ -366,7 +366,7 @@ void SoundMidiPC::onTimer(void *refCon) { music->_fadeStartTime = 0; music->_fadeMusicOut = false; music->_isPlaying = false; - + music->_eventFromMusic = true; // from sound/midiparser.cpp for (int i = 0; i < 128; ++i) { |