diff options
author | Colin Snover | 2018-01-31 12:33:13 -0600 |
---|---|---|
committer | Colin Snover | 2018-01-31 21:24:09 -0600 |
commit | 08186aeec65fc73fcd381e75139281109524dfdc (patch) | |
tree | bb3a130420853cbe15a21af359293994ffbe57b0 /engines | |
parent | 156c3b471c9231a4e003557c25f0a55b95669247 (diff) | |
download | scummvm-rg350-08186aeec65fc73fcd381e75139281109524dfdc.tar.gz scummvm-rg350-08186aeec65fc73fcd381e75139281109524dfdc.tar.bz2 scummvm-rg350-08186aeec65fc73fcd381e75139281109524dfdc.zip |
SCUMM: Rename iMUSE save/load function to avoid confusing function hiding
Diffstat (limited to 'engines')
-rw-r--r-- | engines/scumm/imuse/imuse.cpp | 4 | ||||
-rw-r--r-- | engines/scumm/imuse/imuse.h | 2 | ||||
-rw-r--r-- | engines/scumm/imuse/imuse_internal.h | 2 | ||||
-rw-r--r-- | engines/scumm/music.h | 3 | ||||
-rw-r--r-- | engines/scumm/players/player_ad.cpp | 2 | ||||
-rw-r--r-- | engines/scumm/players/player_mac.cpp | 2 | ||||
-rw-r--r-- | engines/scumm/saveload.cpp | 2 |
7 files changed, 7 insertions, 10 deletions
diff --git a/engines/scumm/imuse/imuse.cpp b/engines/scumm/imuse/imuse.cpp index 109125eae6..5de921bc6b 100644 --- a/engines/scumm/imuse/imuse.cpp +++ b/engines/scumm/imuse/imuse.cpp @@ -372,8 +372,8 @@ static void syncWithSerializer(Common::Serializer &s, ImTrigger &it) { s.syncArray(it.command, 8, Common::Serializer::Uint16LE, VER(54)); } -void IMuseInternal::saveLoadWithSerializer(Common::Serializer &s, ScummEngine *scumm, bool fixAfterLoad) { - Common::StackLock lock(_mutex, "IMuseInternal::saveLoadWithSerializer()"); +void IMuseInternal::saveLoadIMuse(Common::Serializer &s, ScummEngine *scumm, bool fixAfterLoad) { + Common::StackLock lock(_mutex, "IMuseInternal::saveLoadIMuse()"); int i; diff --git a/engines/scumm/imuse/imuse.h b/engines/scumm/imuse/imuse.h index 513d27e8e9..a30d3db8b2 100644 --- a/engines/scumm/imuse/imuse.h +++ b/engines/scumm/imuse/imuse.h @@ -62,7 +62,7 @@ public: public: virtual void on_timer(MidiDriver *midi) = 0; virtual void pause(bool paused) = 0; - virtual void saveLoadWithSerializer(Common::Serializer &ser, ScummEngine *scumm, bool fixAfterLoad = true) = 0; + virtual void saveLoadIMuse(Common::Serializer &ser, ScummEngine *scumm, bool fixAfterLoad = true) = 0; virtual bool get_sound_active(int sound) const = 0; virtual int32 doCommand(int numargs, int args[]) = 0; virtual int clear_queue() = 0; diff --git a/engines/scumm/imuse/imuse_internal.h b/engines/scumm/imuse/imuse_internal.h index e1e3548802..36793b85cc 100644 --- a/engines/scumm/imuse/imuse_internal.h +++ b/engines/scumm/imuse/imuse_internal.h @@ -518,7 +518,7 @@ protected: public: // IMuse interface void pause(bool paused); - void saveLoadWithSerializer(Common::Serializer &ser, ScummEngine *scumm, bool fixAfterLoad = true); + void saveLoadIMuse(Common::Serializer &ser, ScummEngine *scumm, bool fixAfterLoad = true); bool get_sound_active(int sound) const; int32 doCommand(int numargs, int args[]); uint32 property(int prop, uint32 value); diff --git a/engines/scumm/music.h b/engines/scumm/music.h index 9c11204102..9404ce7af3 100644 --- a/engines/scumm/music.h +++ b/engines/scumm/music.h @@ -28,8 +28,6 @@ namespace Scumm { -class ScummEngine; - /** * Pure virtual base class for the various music/sound engines used in Scumm * games. In particular, the iMuse code provides a subclass of this. There are @@ -86,7 +84,6 @@ public: * Save or load the music state. */ virtual void saveLoadWithSerializer(Common::Serializer &ser) {} - virtual void saveLoadWithSerializer(Common::Serializer &ser, ScummEngine *scumm, bool fixAfterLoad = true) {} }; } // End of namespace Scumm diff --git a/engines/scumm/players/player_ad.cpp b/engines/scumm/players/player_ad.cpp index 0223da5acb..7f0f449a92 100644 --- a/engines/scumm/players/player_ad.cpp +++ b/engines/scumm/players/player_ad.cpp @@ -195,7 +195,7 @@ void Player_AD::saveLoadWithSerializer(Common::Serializer &s) { if (s.getVersion() < VER(95)) { IMuse *dummyImuse = IMuse::create(_vm->_system, NULL, NULL); - dummyImuse->saveLoadWithSerializer(s, _vm, false); + dummyImuse->saveLoadIMuse(s, _vm, false); delete dummyImuse; return; } diff --git a/engines/scumm/players/player_mac.cpp b/engines/scumm/players/player_mac.cpp index cc65adceab..0a677c9973 100644 --- a/engines/scumm/players/player_mac.cpp +++ b/engines/scumm/players/player_mac.cpp @@ -115,7 +115,7 @@ void Player_Mac::saveLoadWithSerializer(Common::Serializer &s) { if (s.getVersion() < VER(94)) { if (_vm->_game.id == GID_MONKEY && s.isLoading()) { IMuse *dummyImuse = IMuse::create(_vm->_system, NULL, NULL); - dummyImuse->saveLoadWithSerializer(s, _vm, false); + dummyImuse->saveLoadIMuse(s, _vm, false); delete dummyImuse; } } else { diff --git a/engines/scumm/saveload.cpp b/engines/scumm/saveload.cpp index ba852ed922..9426f5e8ca 100644 --- a/engines/scumm/saveload.cpp +++ b/engines/scumm/saveload.cpp @@ -1460,7 +1460,7 @@ void ScummEngine::saveLoadWithSerializer(Common::Serializer &s) { // Save/load the iMuse status // if (_imuse && (_saveSound || !_saveTemporaryState)) { - _imuse->saveLoadWithSerializer(s, this); + _imuse->saveLoadIMuse(s, this); } |