aboutsummaryrefslogtreecommitdiff
path: root/engines/scumm/imuse/imuse.cpp
diff options
context:
space:
mode:
authorColin Snover2018-01-31 12:33:13 -0600
committerColin Snover2018-01-31 21:24:09 -0600
commit08186aeec65fc73fcd381e75139281109524dfdc (patch)
treebb3a130420853cbe15a21af359293994ffbe57b0 /engines/scumm/imuse/imuse.cpp
parent156c3b471c9231a4e003557c25f0a55b95669247 (diff)
downloadscummvm-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/scumm/imuse/imuse.cpp')
-rw-r--r--engines/scumm/imuse/imuse.cpp4
1 files changed, 2 insertions, 2 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;