[Scummvm-git-logs] scummvm master -> e775552e9d283845d4094c57fbd986c9cd5b4305

[bluegr]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
e775552e9d GROOVIE: Fix overridden class members


Commit: e775552e9d283845d4094c57fbd986c9cd5b4305
    https://github.com/scummvm/scummvm/commit/e775552e9d283845d4094c57fbd986c9cd5b4305
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2021-10-24T17:30:14+03:00

Commit Message:
GROOVIE: Fix overridden class members

Changed paths:
    engines/groovie/music.cpp
    engines/groovie/music.h
    engines/groovie/video/roq.h


diff --git a/engines/groovie/music.cpp b/engines/groovie/music.cpp
index fc1ca1b9ca..f414e92036 100644
--- a/engines/groovie/music.cpp
+++ b/engines/groovie/music.cpp
@@ -771,8 +771,8 @@ void MusicPlayerTlc::updateVolume() {
 	_vm->_system->getMixer()->setVolumeForSoundType(Audio::Mixer::kMusicSoundType, _userVolume * _gameVolume / 100);
 }
 
-void MusicPlayerTlc::unload() {
-	MusicPlayer::unload();
+void MusicPlayerTlc::unload(bool updateState) {
+	MusicPlayer::unload(updateState);
 
 	_vm->_system->getMixer()->stopHandle(_handle);
 	if (_file) {
diff --git a/engines/groovie/music.h b/engines/groovie/music.h
index 6c161ae8f3..a5fd537ee2 100644
--- a/engines/groovie/music.h
+++ b/engines/groovie/music.h
@@ -214,8 +214,8 @@ public:
 protected:
 	virtual Common::String getFilename(uint32 fileref);
 	void updateVolume();
-	bool load(uint32 fileref, bool loop);
-	void unload();
+	bool load(uint32 fileref, bool loop) override;
+	void unload(bool updateState = true) override;
 
 private:
 	Audio::SoundHandle _handle;
diff --git a/engines/groovie/video/roq.h b/engines/groovie/video/roq.h
index b59f332aa3..482d3644d7 100644
--- a/engines/groovie/video/roq.h
+++ b/engines/groovie/video/roq.h
@@ -40,7 +40,7 @@ class ROQPlayer : public VideoPlayer {
 public:
 	ROQPlayer(GroovieEngine *vm);
 	~ROQPlayer();
-	void setOrigin(int16 x, int16 y);
+	void setOrigin(int16 x, int16 y) override;
 
 	Audio::SoundHandle getSoundHandle() {
 		return _soundHandle;