From 0b4a0220183db75d5292dd1f13c74b71824cc7e4 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Thu, 24 Nov 2011 00:01:29 +0200
Subject: TOLTECS: Save music in saved games

Also, move all music resource related code into its own class
---
 engines/toltecs/saveload.cpp | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'engines/toltecs/saveload.cpp')

diff --git a/engines/toltecs/saveload.cpp b/engines/toltecs/saveload.cpp
index af78c8b975..c24d2149b0 100644
--- a/engines/toltecs/saveload.cpp
+++ b/engines/toltecs/saveload.cpp
@@ -27,6 +27,7 @@
 
 #include "toltecs/toltecs.h"
 #include "toltecs/animation.h"
+#include "toltecs/music.h"
 #include "toltecs/palette.h"
 #include "toltecs/script.h"
 #include "toltecs/screen.h"
@@ -40,7 +41,7 @@ namespace Toltecs {
 	- Maybe switch to SCUMM/Tinsel serialization approach?
 */
 
-#define TOLTECS_SAVEGAME_VERSION 2
+#define TOLTECS_SAVEGAME_VERSION 3
 
 ToltecsEngine::kReadSaveHeaderError ToltecsEngine::readSaveHeader(Common::SeekableReadStream *in, bool loadThumbnail, SaveHeader &header) {
 
@@ -133,6 +134,7 @@ void ToltecsEngine::savegame(const char *filename, const char *description) {
 	_anim->saveState(out);
 	_screen->saveState(out);
 	_sound->saveState(out);
+	_music->saveState(out);
 
 	out->finalize();
 	delete out;
@@ -156,6 +158,7 @@ void ToltecsEngine::loadgame(const char *filename) {
 	}
 	
 	_sound->stopAll();
+	_music->stopSequence();
 	g_engine->setTotalPlayTime(header.playTime * 1000);
 
 	_cameraX = in->readUint16LE();
@@ -189,6 +192,8 @@ void ToltecsEngine::loadgame(const char *filename) {
 	_screen->loadState(in);
 	if (header.version >= 2)
 		_sound->loadState(in);
+	if (header.version >= 3)
+		_music->loadState(in);
 
 	delete in;
 
-- 
cgit v1.2.3