diff options
| author | Johannes Schickel | 2013-01-26 05:25:14 -0800 |
|---|---|---|
| committer | Johannes Schickel | 2013-01-26 05:25:14 -0800 |
| commit | 59dde5451908de79a89ee29937f3878cf221cc93 (patch) | |
| tree | af40548096459f766726938a0db278224f48705a /engines/kyra | |
| parent | 94edb3409fa949a6391c54adb4bf7fc4a1d210ad (diff) | |
| parent | 4d3ecbfcd2aabf0885df978e6e44ef8b8256c657 (diff) | |
| download | scummvm-rg350-59dde5451908de79a89ee29937f3878cf221cc93.tar.gz scummvm-rg350-59dde5451908de79a89ee29937f3878cf221cc93.tar.bz2 scummvm-rg350-59dde5451908de79a89ee29937f3878cf221cc93.zip | |
Merge pull request #301 from lordhoto/c++11-playground
RFC: Allow use of override and nullptr. Also allow C++11 compilation.
Diffstat (limited to 'engines/kyra')
| -rw-r--r-- | engines/kyra/sound_intern.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/engines/kyra/sound_intern.h b/engines/kyra/sound_intern.h index 4bf43d73d8..007ca3d3f5 100644 --- a/engines/kyra/sound_intern.h +++ b/engines/kyra/sound_intern.h @@ -183,7 +183,7 @@ public: virtual void haltTrack(); virtual void beginFadeOut(); - virtual int32 voicePlay(const char *file, Audio::SoundHandle *handle, uint8 volume, uint8 priority, bool isSfx) { return -1; } + virtual int32 voicePlay(const char *file, Audio::SoundHandle *handle, uint8 volume, uint8 priority, bool isSfx) override { return -1; } virtual void playSoundEffect(uint8 track, uint8 volume = 0xFF); virtual void updateVolumeSettings(); @@ -219,7 +219,7 @@ public: virtual void haltTrack(); virtual void beginFadeOut(); - virtual int32 voicePlay(const char *file, Audio::SoundHandle *handle, uint8 volume = 255, uint8 priority = 255, bool isSfx = true); + virtual int32 voicePlay(const char *file, Audio::SoundHandle *handle, uint8 volume = 255, uint8 priority = 255, bool isSfx = true) override; virtual void playSoundEffect(uint8 track, uint8 volume = 0xFF); virtual void updateVolumeSettings(); @@ -334,7 +334,7 @@ public: virtual void haltTrack(); virtual void beginFadeOut(); - virtual int32 voicePlay(const char *file, Audio::SoundHandle *handle, uint8 volume, uint8 priority, bool isSfx) { return -1; } + virtual int32 voicePlay(const char *file, Audio::SoundHandle *handle, uint8 volume, uint8 priority, bool isSfx) override { return -1; } virtual void playSoundEffect(uint8 track, uint8 volume = 0xFF); protected: |