[Scummvm-git-logs] scummvm master -> 540a3cd7a545f0d1382ad36a740d62e3f3ac5b31

bluegr bluegr at gmail.com
Sun Mar 15 23:22:53 UTC 2020


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:
540a3cd7a5 SCI: adding `stopAfterFading` to savegame, fixing #10685


Commit: 540a3cd7a545f0d1382ad36a740d62e3f3ac5b31
    https://github.com/scummvm/scummvm/commit/540a3cd7a545f0d1382ad36a740d62e3f3ac5b31
Author: Zvika Haramaty (haramaty.zvika at gmail.com)
Date: 2020-03-16T01:22:50+02:00

Commit Message:
SCI: adding `stopAfterFading` to savegame, fixing #10685

Changed paths:
    engines/sci/engine/savegame.cpp
    engines/sci/engine/savegame.h


diff --git a/engines/sci/engine/savegame.cpp b/engines/sci/engine/savegame.cpp
index ed0d03ecba..f945097f8c 100644
--- a/engines/sci/engine/savegame.cpp
+++ b/engines/sci/engine/savegame.cpp
@@ -674,6 +674,7 @@ void MusicEntry::saveLoadWithSerializer(Common::Serializer &s) {
 	s.syncAsSint16LE(fadeStep);
 	s.syncAsSint32LE(fadeTicker);
 	s.syncAsSint32LE(fadeTickerStep);
+	s.syncAsByte(stopAfterFading, VER(45));
 	s.syncAsByte(status);
 	if (s.getVersion() >= 32)
 		s.syncAsByte(playBed);
diff --git a/engines/sci/engine/savegame.h b/engines/sci/engine/savegame.h
index ac79a76aff..76f7cec58a 100644
--- a/engines/sci/engine/savegame.h
+++ b/engines/sci/engine/savegame.h
@@ -37,6 +37,7 @@ struct EngineState;
  *
  * Version - new/changed feature
  * =============================
+ *      45 - Sync stopAfterFading
  *      44 - GK2+SCI3 audio resource locks
  *      43 - stop saving SCI3 mustSetViewVisible array
  *      42 - SCI3 robots and VM objects
@@ -69,7 +70,7 @@ struct EngineState;
  */
 
 enum {
-	CURRENT_SAVEGAME_VERSION = 44,
+	CURRENT_SAVEGAME_VERSION = 45,
 	MINIMUM_SAVEGAME_VERSION = 14
 #ifdef ENABLE_SCI32
 	,




More information about the Scummvm-git-logs mailing list