diff options
-rw-r--r-- | scumm/player_v1.h | 8 | ||||
-rw-r--r-- | scumm/player_v2.h | 7 | ||||
-rw-r--r-- | scumm/player_v2a.h | 6 | ||||
-rw-r--r-- | scumm/player_v3a.h | 6 |
4 files changed, 13 insertions, 14 deletions
diff --git a/scumm/player_v1.h b/scumm/player_v1.h index 27d23aafbf..bf64cc472d 100644 --- a/scumm/player_v1.h +++ b/scumm/player_v1.h @@ -47,10 +47,10 @@ public: Player_V1(ScummEngine *scumm); ~Player_V1(); - void startSound(int nr); - void stopAllSounds(); - void stopSound(int nr); - int getMusicTimer() const; + virtual void startSound(int sound); + virtual void stopSound(int sound); + virtual void stopAllSounds(); + virtual int getMusicTimer() const; protected: virtual void nextTick(); diff --git a/scumm/player_v2.h b/scumm/player_v2.h index c3608b5e1c..437fd0b365 100644 --- a/scumm/player_v2.h +++ b/scumm/player_v2.h @@ -77,12 +77,11 @@ public: virtual ~Player_V2(); virtual void setMasterVolume(int vol); - - virtual void startSound(int nr); - virtual void stopSound(int nr); + virtual void startSound(int sound); + virtual void stopSound(int sound); virtual void stopAllSounds(); - virtual int getSoundStatus(int nr) const; virtual int getMusicTimer() const; + virtual int getSoundStatus(int sound) const; protected: bool _isV3Game; diff --git a/scumm/player_v2a.h b/scumm/player_v2a.h index fb18d5cd54..b39c52f866 100644 --- a/scumm/player_v2a.h +++ b/scumm/player_v2a.h @@ -41,11 +41,11 @@ public: virtual ~Player_V2A(); virtual void setMasterVolume(int vol); - virtual void startSound(int nr); - virtual void stopSound(int nr); + virtual void startSound(int sound); + virtual void stopSound(int sound); virtual void stopAllSounds(); virtual int getMusicTimer() const; - virtual int getSoundStatus(int nr) const; + virtual int getSoundStatus(int sound) const; private: OSystem *_system; diff --git a/scumm/player_v3a.h b/scumm/player_v3a.h index 874057bb9c..2542045cc4 100644 --- a/scumm/player_v3a.h +++ b/scumm/player_v3a.h @@ -40,11 +40,11 @@ public: virtual ~Player_V3A(); virtual void setMasterVolume(int vol); - virtual void startSound(int nr); - virtual void stopSound(int nr); + virtual void startSound(int sound); + virtual void stopSound(int sound); virtual void stopAllSounds(); virtual int getMusicTimer() const; - virtual int getSoundStatus(int nr) const; + virtual int getSoundStatus(int sound) const; private: OSystem *_system; |