From 88354bed23fae4a9fb719c875558d6b4ec069ac3 Mon Sep 17 00:00:00 2001 From: Johannes Schickel Date: Sun, 7 Aug 2011 15:58:27 +0200 Subject: SCUMM: Mark some overwritten methods as virtual. --- engines/scumm/player_v2.h | 5 +---- engines/scumm/player_v2base.h | 6 +++--- engines/scumm/player_v2cms.h | 4 ++-- 3 files changed, 6 insertions(+), 9 deletions(-) (limited to 'engines') 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 -- cgit v1.2.3