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

[csnover]

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

Summary:
08186aeec6 SCUMM: Rename iMUSE save/load function to avoid confusing function hiding
ffdb5a8ebc SCUMM: Fix compilation failure when DISABLE_TOWNS_DUAL_LAYER_MODE is defined


Commit: 08186aeec65fc73fcd381e75139281109524dfdc
    https://github.com/scummvm/scummvm/commit/08186aeec65fc73fcd381e75139281109524dfdc
Author: Colin Snover (github.com at zetafleet.com)
Date: 2018-01-31T21:24:09-06:00

Commit Message:
SCUMM: Rename iMUSE save/load function to avoid confusing function hiding

Changed paths:
    engines/scumm/imuse/imuse.cpp
    engines/scumm/imuse/imuse.h
    engines/scumm/imuse/imuse_internal.h
    engines/scumm/music.h
    engines/scumm/players/player_ad.cpp
    engines/scumm/players/player_mac.cpp
    engines/scumm/saveload.cpp


diff --git a/engines/scumm/imuse/imuse.cpp b/engines/scumm/imuse/imuse.cpp
index 109125e..5de921b 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 513d27e..a30d3db 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 e1e3548..36793b8 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 9c11204..9404ce7 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 0223da5..7f0f449 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 cc65adc..0a677c9 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 ba852ed..9426f5e 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);
 	}
 
 


Commit: ffdb5a8ebc61770cb7ea11bbcbc45cc7e64c0f71
    https://github.com/scummvm/scummvm/commit/ffdb5a8ebc61770cb7ea11bbcbc45cc7e64c0f71
Author: Colin Snover (github.com at zetafleet.com)
Date: 2018-01-31T21:24:09-06:00

Commit Message:
SCUMM: Fix compilation failure when DISABLE_TOWNS_DUAL_LAYER_MODE is defined

Changed paths:
    engines/scumm/saveload.cpp


diff --git a/engines/scumm/saveload.cpp b/engines/scumm/saveload.cpp
index 9426f5e..d04b3bb 100644
--- a/engines/scumm/saveload.cpp
+++ b/engines/scumm/saveload.cpp
@@ -1303,13 +1303,12 @@ void ScummEngine::saveLoadWithSerializer(Common::Serializer &s) {
 
 #ifdef DISABLE_TOWNS_DUAL_LAYER_MODE
 	byte hasTownsData = 0;
-	if (_game.platform == Common::kPlatformFMTowns && s->getVersion() > VER(87))
-		s->saveLoadArrayOf(&hasTownsData, 1, sizeof(byte), sleByte);
+	if (_game.platform == Common::kPlatformFMTowns && s.getVersion() > VER(87))
+		s.syncAsByte(hasTownsData);
 
 	if (hasTownsData) {
 		// Skip FM-Towns specific data
-		for (i = 69 * sizeof(uint8) + 44 * sizeof(int16); i; i--)
-			s->loadByte();
+		s.skip(69 + 44 * sizeof(int16));
 	}
 
 #else