diff options
author | Max Horn | 2007-04-26 19:08:53 +0000 |
---|---|---|
committer | Max Horn | 2007-04-26 19:08:53 +0000 |
commit | d4660cce55e8b49d1387a8f117b370fe76361720 (patch) | |
tree | 5ee4a67dadc2c510856ffbb7f3f2e4f6fee59079 /engines | |
parent | 8b7d458668b93cf5cbfdc6e8c326a639b29ecc8b (diff) | |
download | scummvm-rg350-d4660cce55e8b49d1387a8f117b370fe76361720.tar.gz scummvm-rg350-d4660cce55e8b49d1387a8f117b370fe76361720.tar.bz2 scummvm-rg350-d4660cce55e8b49d1387a8f117b370fe76361720.zip |
Removing more semicola
svn-id: r26597
Diffstat (limited to 'engines')
-rw-r--r-- | engines/agos/sound.cpp | 14 | ||||
-rw-r--r-- | engines/kyra/kyra.h | 2 | ||||
-rw-r--r-- | engines/lure/hotspots.h | 2 | ||||
-rw-r--r-- | engines/lure/intro.h | 2 | ||||
-rw-r--r-- | engines/lure/res_struct.h | 2 | ||||
-rw-r--r-- | engines/lure/strings.h | 2 | ||||
-rw-r--r-- | engines/queen/sound.cpp | 2 | ||||
-rw-r--r-- | engines/sky/music/musicbase.h | 2 |
8 files changed, 14 insertions, 14 deletions
diff --git a/engines/agos/sound.cpp b/engines/agos/sound.cpp index b11c130f87..1cfd465cd6 100644 --- a/engines/agos/sound.cpp +++ b/engines/agos/sound.cpp @@ -116,21 +116,21 @@ bool LoopingAudioStream::endOfData() const { class WavSound : public BaseSound { public: - WavSound(Audio::Mixer *mixer, File *file, uint32 base = 0, bool bigEndian = false) : BaseSound(mixer, file, base, bigEndian) {}; - WavSound(Audio::Mixer *mixer, File *file, uint32 *offsets) : BaseSound(mixer, file, offsets) {}; + WavSound(Audio::Mixer *mixer, File *file, uint32 base = 0, bool bigEndian = false) : BaseSound(mixer, file, base, bigEndian) {} + WavSound(Audio::Mixer *mixer, File *file, uint32 *offsets) : BaseSound(mixer, file, offsets) {} Audio::AudioStream *makeAudioStream(uint sound); void playSound(uint sound, uint loopSound, Audio::SoundHandle *handle, byte flags, int vol = 0); }; class VocSound : public BaseSound { public: - VocSound(Audio::Mixer *mixer, File *file, uint32 base = 0, bool bigEndian = false) : BaseSound(mixer, file, base, bigEndian) {}; + VocSound(Audio::Mixer *mixer, File *file, uint32 base = 0, bool bigEndian = false) : BaseSound(mixer, file, base, bigEndian) {} void playSound(uint sound, uint loopSound, Audio::SoundHandle *handle, byte flags, int vol = 0); }; class RawSound : public BaseSound { public: - RawSound(Audio::Mixer *mixer, File *file, uint32 base = 0, bool bigEndian = false) : BaseSound(mixer, file, base, bigEndian) {}; + RawSound(Audio::Mixer *mixer, File *file, uint32 base = 0, bool bigEndian = false) : BaseSound(mixer, file, base, bigEndian) {} void playSound(uint sound, uint loopSound, Audio::SoundHandle *handle, byte flags, int vol = 0); }; @@ -267,7 +267,7 @@ void RawSound::playSound(uint sound, uint loopSound, Audio::SoundHandle *handle, #ifdef USE_MAD class MP3Sound : public BaseSound { public: - MP3Sound(Audio::Mixer *mixer, File *file, uint32 base = 0) : BaseSound(mixer, file, base) {}; + MP3Sound(Audio::Mixer *mixer, File *file, uint32 base = 0) : BaseSound(mixer, file, base) {} Audio::AudioStream *makeAudioStream(uint sound); void playSound(uint sound, uint loopSound, Audio::SoundHandle *handle, byte flags, int vol = 0); }; @@ -296,7 +296,7 @@ void MP3Sound::playSound(uint sound, uint loopSound, Audio::SoundHandle *handle, #ifdef USE_VORBIS class VorbisSound : public BaseSound { public: - VorbisSound(Audio::Mixer *mixer, File *file, uint32 base = 0) : BaseSound(mixer, file, base) {}; + VorbisSound(Audio::Mixer *mixer, File *file, uint32 base = 0) : BaseSound(mixer, file, base) {} Audio::AudioStream *makeAudioStream(uint sound); void playSound(uint sound, uint loopSound, Audio::SoundHandle *handle, byte flags, int vol = 0); }; @@ -325,7 +325,7 @@ void VorbisSound::playSound(uint sound, uint loopSound, Audio::SoundHandle *hand #ifdef USE_FLAC class FlacSound : public BaseSound { public: - FlacSound(Audio::Mixer *mixer, File *file, uint32 base = 0) : BaseSound(mixer, file, base) {}; + FlacSound(Audio::Mixer *mixer, File *file, uint32 base = 0) : BaseSound(mixer, file, base) {} Audio::AudioStream *makeAudioStream(uint sound); void playSound(uint sound, uint loopSound, Audio::SoundHandle *handle, byte flags, int vol = 0); }; diff --git a/engines/kyra/kyra.h b/engines/kyra/kyra.h index fa4ff7ef7d..ff72583241 100644 --- a/engines/kyra/kyra.h +++ b/engines/kyra/kyra.h @@ -747,7 +747,7 @@ protected: // Kyra 2 and 3 main menu static const char *_mainMenuStrings[]; - virtual void gui_initMainMenu() {}; + virtual void gui_initMainMenu() {} int gui_handleMainMenu(); virtual void gui_updateMainMenuAnimation(); void gui_drawMainMenu(const char * const *strings, int select); diff --git a/engines/lure/hotspots.h b/engines/lure/hotspots.h index 1531c54467..9e849b0e28 100644 --- a/engines/lure/hotspots.h +++ b/engines/lure/hotspots.h @@ -166,7 +166,7 @@ private: Direction _direction; int _numSteps; public: - WalkingActionEntry(Direction dir, int steps): _direction(dir), _numSteps(steps) {}; + WalkingActionEntry(Direction dir, int steps): _direction(dir), _numSteps(steps) {} Direction direction() { return _direction; } int &rawSteps() { return _numSteps; } int numSteps(); diff --git a/engines/lure/intro.h b/engines/lure/intro.h index 848d0ca19e..1a14ae1ec1 100644 --- a/engines/lure/intro.h +++ b/engines/lure/intro.h @@ -35,7 +35,7 @@ private: bool showScreen(uint16 screenId, uint16 paletteId, uint16 delaySize); bool delay(uint32 milliseconds); public: - Introduction(Screen &screen, OSystem &system): _screen(screen), _system(system) {}; + Introduction(Screen &screen, OSystem &system): _screen(screen), _system(system) {} bool show(); }; diff --git a/engines/lure/res_struct.h b/engines/lure/res_struct.h index ac3bd4d6cf..8e4d9a8e54 100644 --- a/engines/lure/res_struct.h +++ b/engines/lure/res_struct.h @@ -303,7 +303,7 @@ class RoomPathsData { private: byte _data[ROOM_PATHS_HEIGHT * ROOM_PATHS_WIDTH]; public: - RoomPathsData() {}; + RoomPathsData() {} RoomPathsData(byte *srcData) { load(srcData); } void load(byte *srcData) { diff --git a/engines/lure/strings.h b/engines/lure/strings.h index a2d6b187c0..1947a14b82 100644 --- a/engines/lure/strings.h +++ b/engines/lure/strings.h @@ -35,7 +35,7 @@ public: char _ascii; CharacterEntry(uint8 numBits, uint32 sequence, char ascii): _numBits(numBits), - _sequence(sequence), _ascii(ascii) {}; + _sequence(sequence), _ascii(ascii) {} }; #define MAX_NUM_CHARS 218 diff --git a/engines/queen/sound.cpp b/engines/queen/sound.cpp index d3ffcd6c2e..378fc04e92 100644 --- a/engines/queen/sound.cpp +++ b/engines/queen/sound.cpp @@ -83,7 +83,7 @@ protected: #ifdef USE_FLAC class FLACSound : public PCSound { public: - FLACSound(Audio::Mixer *mixer, QueenEngine *vm) : PCSound(mixer, vm) {}; + FLACSound(Audio::Mixer *mixer, QueenEngine *vm) : PCSound(mixer, vm) {} protected: void playSoundData(Common::File *f, uint32 size, Audio::SoundHandle *soundHandle) { _mixer->playInputStream(Audio::Mixer::kSFXSoundType, soundHandle, Audio::makeFlacStream(f, size)); diff --git a/engines/sky/music/musicbase.h b/engines/sky/music/musicbase.h index 1f2bd58740..1adb03fc9c 100644 --- a/engines/sky/music/musicbase.h +++ b/engines/sky/music/musicbase.h @@ -39,7 +39,7 @@ typedef struct { class ChannelBase { public: - virtual ~ChannelBase() {}; + virtual ~ChannelBase() {} virtual uint8 process(uint16 aktTime) = 0; virtual void updateVolume(uint16 pVolume) = 0; virtual bool isActive(void) = 0; |