[Scummvm-cvs-logs] SF.net SVN: scummvm:[34988] scummvm/trunk/engines/saga

[thebluegr at users.sourceforge.net]

Revision: 34988
          http://scummvm.svn.sourceforge.net/scummvm/?rev=34988&view=rev
Author:   thebluegr
Date:     2008-11-10 18:51:51 +0000 (Mon, 10 Nov 2008)

Log Message:
-----------
Cleanup

Modified Paths:
--------------
    scummvm/trunk/engines/saga/detection.cpp
    scummvm/trunk/engines/saga/saga.cpp
    scummvm/trunk/engines/saga/saga.h
    scummvm/trunk/engines/saga/saveload.cpp

Modified: scummvm/trunk/engines/saga/detection.cpp
===================================================================
--- scummvm/trunk/engines/saga/detection.cpp	2008-11-10 14:34:32 UTC (rev 34987)
+++ scummvm/trunk/engines/saga/detection.cpp	2008-11-10 18:51:51 UTC (rev 34988)
@@ -229,7 +229,6 @@
 	static char fileName[MAX_FILE_NAME];
 	sprintf(fileName, "%s.s%02d", target, slot);
 	char title[TITLESIZE];
-	Graphics::Surface *thumbnail;
 
 	Common::InSaveFile *in = g_system->getSavefileManager()->openForLoading(fileName);
 
@@ -268,7 +267,7 @@
 		desc.setWriteProtectedFlag(false);
 
 		if (version >= 6) {
-			thumbnail = new Graphics::Surface();
+			Graphics::Surface *thumbnail = new Graphics::Surface();
 			assert(thumbnail);
 			if (!Graphics::loadThumbnail(*in, *thumbnail)) {
 				delete thumbnail;
@@ -356,4 +355,13 @@
 	return Common::kNoError;	// TODO: return success/failure
 }
 
+bool SagaEngine::canLoadGameStateCurrently() { 
+	return !_scene->isInIntro();
+}
+
+bool SagaEngine::canSaveGameStateCurrently() { 
+	return !_scene->isInIntro() && 
+		   (_interface->getMode() == kPanelMain || _interface->getMode() == kPanelChapterSelection);
+}
+
 } // End of namespace Saga

Modified: scummvm/trunk/engines/saga/saga.cpp
===================================================================
--- scummvm/trunk/engines/saga/saga.cpp	2008-11-10 14:34:32 UTC (rev 34987)
+++ scummvm/trunk/engines/saga/saga.cpp	2008-11-10 18:51:51 UTC (rev 34988)
@@ -532,13 +532,4 @@
 	_sound->setVolume();
 }
 
-bool SagaEngine::canLoadGameStateCurrently() { 
-	return !_scene->isInIntro();
-}
-
-bool SagaEngine::canSaveGameStateCurrently() { 
-	return !_scene->isInIntro() && 
-		   (_interface->getMode() == kPanelMain || _interface->getMode() == kPanelChapterSelection);
-}
-
 } // End of namespace Saga

Modified: scummvm/trunk/engines/saga/saga.h
===================================================================
--- scummvm/trunk/engines/saga/saga.h	2008-11-10 14:34:32 UTC (rev 34987)
+++ scummvm/trunk/engines/saga/saga.h	2008-11-10 18:51:51 UTC (rev 34988)
@@ -470,7 +470,6 @@
 	uint32 size;
 	uint32 version;
 	char name[SAVE_TITLE_SIZE];
-	Graphics::Surface *thumbnail;
 };
 
 inline int objectTypeId(uint16 objectId) {

Modified: scummvm/trunk/engines/saga/saveload.cpp
===================================================================
--- scummvm/trunk/engines/saga/saveload.cpp	2008-11-10 14:34:32 UTC (rev 34987)
+++ scummvm/trunk/engines/saga/saveload.cpp	2008-11-10 18:51:51 UTC (rev 34988)
@@ -274,12 +274,12 @@
 	}
 
 	if (_saveHeader.version >= 6) {
-		_saveHeader.thumbnail = new Graphics::Surface();
-		assert(_saveHeader.thumbnail);
-		if (!Graphics::loadThumbnail(*in, *_saveHeader.thumbnail)) {
-			delete _saveHeader.thumbnail;
-			_saveHeader.thumbnail = 0;
-		}
+		// We don't need the thumbnail here, so just read it and discard it
+		Graphics::Surface *thumbnail = new Graphics::Surface();
+		assert(thumbnail);
+		Graphics::loadThumbnail(*in, *thumbnail);
+		delete thumbnail;
+		thumbnail = 0;
 
 		in->readUint32BE();	// save date
 		in->readUint16BE(); // save time


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.