diff options
| author | Travis Howell | 2003-07-23 05:18:47 +0000 |
|---|---|---|
| committer | Travis Howell | 2003-07-23 05:18:47 +0000 |
| commit | fc5080bfb2bd4d8e3ec656375cfbcb05700661b1 (patch) | |
| tree | a6d248eab0cda8f34ba6ab13a273f17a54246a84 | |
| parent | 13dae9b394dd9d7c8046b0771c6800d74b6f6ab9 (diff) | |
| download | scummvm-rg350-fc5080bfb2bd4d8e3ec656375cfbcb05700661b1.tar.gz scummvm-rg350-fc5080bfb2bd4d8e3ec656375cfbcb05700661b1.tar.bz2 scummvm-rg350-fc5080bfb2bd4d8e3ec656375cfbcb05700661b1.zip | |
Ooops that should not have been commmited
svn-id: r9142
| -rw-r--r-- | backends/sdl/sdl-common.cpp | 4 | ||||
| -rw-r--r-- | scumm/sound.cpp | 2 |
2 files changed, 1 insertions, 5 deletions
diff --git a/backends/sdl/sdl-common.cpp b/backends/sdl/sdl-common.cpp index 3d9d6c794e..f39525893c 100644 --- a/backends/sdl/sdl-common.cpp +++ b/backends/sdl/sdl-common.cpp @@ -106,10 +106,6 @@ OSystem_SDL_Common::OSystem_SDL_Common() // reset mouse state memset(&km, 0, sizeof(km)); - cd_end_time = 0; - cd_num_loops = 0; - cd_duration = 0; - cd_stop_time = 0; } OSystem_SDL_Common::~OSystem_SDL_Common() { diff --git a/scumm/sound.cpp b/scumm/sound.cpp index 98361cb816..0a7eefaeca 100644 --- a/scumm/sound.cpp +++ b/scumm/sound.cpp @@ -470,7 +470,7 @@ void Sound::playSound(int soundID) { } - if (_scumm->_gameId == GID_LOOM) { + if (_scumm->_gameId == GID_LOOM && (READ_LE_UINT16(ptr + 4) == 'so')) { // Mac version of Loom uses yet another sound format /* playSound #9 (room 70) |