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

athrxx noreply at scummvm.org
Wed Jan 31 18:47:25 UTC 2024


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:
e1341e3afd SCUMM: fix virtual/override keywords


Commit: e1341e3afd09eb10c163929882a472c4c6f30e53
    https://github.com/scummvm/scummvm/commit/e1341e3afd09eb10c163929882a472c4c6f30e53
Author: athrxx (athrxx at scummvm.org)
Date: 2024-01-31T19:46:57+01:00

Commit Message:
SCUMM: fix virtual/override keywords

Changed paths:
    engines/scumm/music.h
    engines/scumm/players/player_mac_indy3.h
    engines/scumm/players/player_towns.h


diff --git a/engines/scumm/music.h b/engines/scumm/music.h
index 71e5fd1311f..e294ffae728 100644
--- a/engines/scumm/music.h
+++ b/engines/scumm/music.h
@@ -106,7 +106,7 @@ public:
 	/**
 	 * Save or load the music state.
 	 */
-	virtual void saveLoadWithSerializer(Common::Serializer &ser) {}
+	void saveLoadWithSerializer(Common::Serializer &ser) override {}
 
 	/**
 	 * Performs necessary post-load operations on the sound engine, like restarting of music
diff --git a/engines/scumm/players/player_mac_indy3.h b/engines/scumm/players/player_mac_indy3.h
index a274ef90e25..864ab50fa77 100644
--- a/engines/scumm/players/player_mac_indy3.h
+++ b/engines/scumm/players/player_mac_indy3.h
@@ -52,7 +52,7 @@ public:
 	int getSoundStatus(int id) const override;
 	void setQuality(int qual) override;
 	void saveLoadWithSerializer(Common::Serializer &ser) override;
-	void restoreAfterLoad();
+	void restoreAfterLoad() override;
 
 private:
 	Common::SharedPtr<I3MPlayer> _player;
diff --git a/engines/scumm/players/player_towns.h b/engines/scumm/players/player_towns.h
index 12a2d125755..69c9c278af4 100644
--- a/engines/scumm/players/player_towns.h
+++ b/engines/scumm/players/player_towns.h
@@ -43,7 +43,7 @@ public:
 	virtual int32 doCommand(int numargs, int args[]) = 0;
 
 	void saveLoadWithSerializer(Common::Serializer &ser) override;
-	virtual void restoreAfterLoad() override;
+	void restoreAfterLoad() override;
 
 	// version 1 specific
 	virtual int getCurrentCdaSound() { return 0; }




More information about the Scummvm-git-logs mailing list