diff options
| author | Johannes Schickel | 2011-08-07 15:58:27 +0200 |
|---|---|---|
| committer | Johannes Schickel | 2011-08-07 15:58:27 +0200 |
| commit | 88354bed23fae4a9fb719c875558d6b4ec069ac3 (patch) | |
| tree | 53b1f100db6c5e69a46c99dcaa6b9454054f2e9b | |
| parent | 6bd9cd33d94867e6cf8fb72b5314d8ed586d8b33 (diff) | |
| download | scummvm-rg350-88354bed23fae4a9fb719c875558d6b4ec069ac3.tar.gz scummvm-rg350-88354bed23fae4a9fb719c875558d6b4ec069ac3.tar.bz2 scummvm-rg350-88354bed23fae4a9fb719c875558d6b4ec069ac3.zip | |
SCUMM: Mark some overwritten methods as virtual.
| -rw-r--r-- | engines/scumm/player_v2.h | 5 | ||||
| -rw-r--r-- | engines/scumm/player_v2base.h | 6 | ||||
| -rw-r--r-- | engines/scumm/player_v2cms.h | 4 |
3 files changed, 6 insertions, 9 deletions
diff --git a/engines/scumm/player_v2.h b/engines/scumm/player_v2.h index 14a0b9c1e0..d932585b8e 100644 --- a/engines/scumm/player_v2.h +++ b/engines/scumm/player_v2.h @@ -46,10 +46,7 @@ public: virtual int getSoundStatus(int sound) const; // AudioStream API - int readBuffer(int16 *buffer, const int numSamples); - bool isStereo() const { return true; } - bool endOfData() const { return false; } - int getRate() const { return _sampleRate; } + virtual int readBuffer(int16 *buffer, const int numSamples); protected: unsigned int _update_step; diff --git a/engines/scumm/player_v2base.h b/engines/scumm/player_v2base.h index 2f048070ad..eb9ed941ca 100644 --- a/engines/scumm/player_v2base.h +++ b/engines/scumm/player_v2base.h @@ -86,9 +86,9 @@ public: return numSamples; } */ - bool isStereo() const { return true; } - bool endOfData() const { return false; } - int getRate() const { return _sampleRate; } + virtual bool isStereo() const { return true; } + virtual bool endOfData() const { return false; } + virtual int getRate() const { return _sampleRate; } protected: enum { diff --git a/engines/scumm/player_v2cms.h b/engines/scumm/player_v2cms.h index 1b825150f5..9faec5e7ac 100644 --- a/engines/scumm/player_v2cms.h +++ b/engines/scumm/player_v2cms.h @@ -46,8 +46,8 @@ public: virtual int getSoundStatus(int sound) const; // AudioStream API - int readBuffer(int16 *buffer, const int numSamples); - bool isStereo() const { return true; } + virtual int readBuffer(int16 *buffer, const int numSamples); + virtual bool isStereo() const { return true; } private: #include "common/pack-start.h" // START STRUCT PACKING |