diff options
| author | Max Horn | 2011-06-20 00:59:48 +0200 |
|---|---|---|
| committer | Max Horn | 2011-06-20 00:59:48 +0200 |
| commit | 88913c0139ac6d1dfb356d3048702b7bc8ef4079 (patch) | |
| tree | a7436d20333c28f87f2ed0bc15c743b5eb8144ee /engines/groovie | |
| parent | 3853e76202b132e769ae149720eca931cd87104a (diff) | |
| download | scummvm-rg350-88913c0139ac6d1dfb356d3048702b7bc8ef4079.tar.gz scummvm-rg350-88913c0139ac6d1dfb356d3048702b7bc8ef4079.tar.bz2 scummvm-rg350-88913c0139ac6d1dfb356d3048702b7bc8ef4079.zip | |
ALL: Remove trailing whitespaces
This tries to make our code a bit more compliant with our code formatting
conventions. For future use, this is the command I used:
git ls-files "*.cpp" "*.h" | xargs sed -i -e 's/[ \t]*$//'
Diffstat (limited to 'engines/groovie')
| -rw-r--r-- | engines/groovie/music.cpp | 8 | ||||
| -rw-r--r-- | engines/groovie/player.h | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/engines/groovie/music.cpp b/engines/groovie/music.cpp index 33fc986193..c6e990dfcf 100644 --- a/engines/groovie/music.cpp +++ b/engines/groovie/music.cpp @@ -801,17 +801,17 @@ bool MusicPlayerIOS::load(uint32 fileref, bool loop) { 19468 ambient (but not 69, amb b. odd) 19470 puzzle 19471 - 19473 + 19473 19475 coffins or blood pump 19476 blood pump or coffins 19493 19499 chapel 19509 downstair ambient 19510 bedroom 'skip 3 and 5' puzzle (should loop from partway?) - 19514 + 19514 19515 bathroom drain teeth */ - if ((fileref >= 19462 && fileref <= 19468) || + if ((fileref >= 19462 && fileref <= 19468) || fileref == 19470 || fileref == 19471 || fileref == 19473 || fileref == 19475 || fileref == 19476 || fileref == 19493 || @@ -849,7 +849,7 @@ bool MusicPlayerIOS::load(uint32 fileref, bool loop) { updateVolume(); // Play! - _vm->_system->getMixer()->playStream(Audio::Mixer::kMusicSoundType, &_handle, audStream); + _vm->_system->getMixer()->playStream(Audio::Mixer::kMusicSoundType, &_handle, audStream); return true; } diff --git a/engines/groovie/player.h b/engines/groovie/player.h index d8135a99b2..c9258ffdbd 100644 --- a/engines/groovie/player.h +++ b/engines/groovie/player.h @@ -53,8 +53,8 @@ protected: Common::SeekableReadStream *_file; uint16 _flags; Audio::QueuingAudioStream *_audioStream; - - + + private: // Synchronization stuff bool _begunPlaying; |