From c0a1d78e0e07ff308edee823e47c869efc2c64ca Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Mon, 10 Sep 2012 23:19:43 +0300
Subject: TOLTECS: Store channel volume/panning information in saved games

---
 engines/toltecs/saveload.cpp | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

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

diff --git a/engines/toltecs/saveload.cpp b/engines/toltecs/saveload.cpp
index c24d2149b0..4de25101d2 100644
--- a/engines/toltecs/saveload.cpp
+++ b/engines/toltecs/saveload.cpp
@@ -36,12 +36,11 @@
 namespace Toltecs {
 
 /* TODO:
-	- Save with F7; Load with F9
 	- Saving during an animation (AnimationPlayer) is not working correctly yet
 	- Maybe switch to SCUMM/Tinsel serialization approach?
 */
 
-#define TOLTECS_SAVEGAME_VERSION 3
+#define TOLTECS_SAVEGAME_VERSION 4
 
 ToltecsEngine::kReadSaveHeaderError ToltecsEngine::readSaveHeader(Common::SeekableReadStream *in, bool loadThumbnail, SaveHeader &header) {
 
@@ -141,8 +140,8 @@ void ToltecsEngine::savegame(const char *filename, const char *description) {
 }
 
 void ToltecsEngine::loadgame(const char *filename) {
-	Common::InSaveFile *in;
-	if (!(in = g_system->getSavefileManager()->openForLoading(filename))) {
+	Common::InSaveFile *in = g_system->getSavefileManager()->openForLoading(filename);
+	if (!in) {
 		warning("Can't open file '%s', game not loaded", filename);
 		return;
 	}
@@ -191,7 +190,7 @@ void ToltecsEngine::loadgame(const char *filename) {
 	_anim->loadState(in);
 	_screen->loadState(in);
 	if (header.version >= 2)
-		_sound->loadState(in);
+		_sound->loadState(in, header.version);
 	if (header.version >= 3)
 		_music->loadState(in);
 
-- 
cgit v1.2.3


From 89abab97e3124fa25eb4c7d3e8b38501747a8d17 Mon Sep 17 00:00:00 2001
From: Johannes Schickel
Date: Wed, 26 Sep 2012 04:17:31 +0200
Subject: JANITORIAL: Remove trailing whitespaces.

Powered by:
git ls-files "*.cpp" "*.h" "*.m" "*.mm" | xargs sed -i -e 's/[ \t]*$//'
---
 engines/toltecs/saveload.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

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

diff --git a/engines/toltecs/saveload.cpp b/engines/toltecs/saveload.cpp
index 4de25101d2..6c195a34c2 100644
--- a/engines/toltecs/saveload.cpp
+++ b/engines/toltecs/saveload.cpp
@@ -92,7 +92,7 @@ void ToltecsEngine::savegame(const char *filename, const char *description) {
 	byte descriptionLen = strlen(description);
 	out->writeByte(descriptionLen);
 	out->write(description, descriptionLen);
-	
+
 	Graphics::saveThumbnail(*out);
 
 	// Not used yet, reserved for future usage
@@ -149,13 +149,13 @@ void ToltecsEngine::loadgame(const char *filename) {
 	SaveHeader header;
 
 	kReadSaveHeaderError errorCode = readSaveHeader(in, false, header);
-	
+
 	if (errorCode != kRSHENoError) {
 		warning("Error loading savegame '%s'", filename);
 		delete in;
 		return;
 	}
-	
+
 	_sound->stopAll();
 	_music->stopSequence();
 	g_engine->setTotalPlayTime(header.playTime * 1000);
@@ -181,7 +181,7 @@ void ToltecsEngine::loadgame(const char *filename) {
 	_mouseX = in->readUint16LE();
 	_mouseY = in->readUint16LE();
 	_mouseDisabled = in->readUint16LE();
-	
+
 	_system->warpMouse(_mouseX, _mouseY);
  	_system->showMouse(_mouseDisabled == 0);
 
-- 
cgit v1.2.3