[Scummvm-cvs-logs] SF.net SVN: scummvm: [29814] scummvm/trunk/engines/lure

[dreammaster at users.sourceforge.net]

Revision: 29814
          http://scummvm.svn.sourceforge.net/scummvm/?rev=29814&view=rev
Author:   dreammaster
Date:     2007-12-10 01:40:49 -0800 (Mon, 10 Dec 2007)

Log Message:
-----------
Changed over warning messages for save/load errors from the debug console to their own dialog

Modified Paths:
--------------
    scummvm/trunk/engines/lure/lure.cpp
    scummvm/trunk/engines/lure/surface.cpp

Modified: scummvm/trunk/engines/lure/lure.cpp
===================================================================
--- scummvm/trunk/engines/lure/lure.cpp	2007-12-10 09:38:47 UTC (rev 29813)
+++ scummvm/trunk/engines/lure/lure.cpp	2007-12-10 09:40:49 UTC (rev 29814)
@@ -167,10 +167,8 @@
 bool LureEngine::saveGame(uint8 slotNumber, Common::String &caption) {
 	Common::WriteStream *f = this->_saveFileMan->openForSaving(
 		generateSaveName(slotNumber));
-	if (f == NULL) {
-		warning("saveGame: Failed to save slot %d", slotNumber);
+	if (f == NULL) 
 		return false;
-	}
 
 	f->write("lure", 5);
 	f->writeByte(getLanguage());
@@ -193,10 +191,8 @@
 bool LureEngine::loadGame(uint8 slotNumber) {
 	Common::ReadStream *f = this->_saveFileMan->openForLoading(
 		generateSaveName(slotNumber));
-	if (f == NULL) {
-		warning(FAILED_MSG, slotNumber);
+	if (f == NULL) 
 		return false;
-	}
 
 	// Check for header
 	char buffer[5];

Modified: scummvm/trunk/engines/lure/surface.cpp
===================================================================
--- scummvm/trunk/engines/lure/surface.cpp	2007-12-10 09:38:47 UTC (rev 29813)
+++ scummvm/trunk/engines/lure/surface.cpp	2007-12-10 09:40:49 UTC (rev 29814)
@@ -852,12 +852,18 @@
 	delete s;
 	Sound.resume();
 
+	int errorFlag = 0;
 	if (doneFlag) {
 		// Handle save or restore
-		if (saveDialog)
+		if (saveDialog) {
 			doneFlag = engine.saveGame(selectedLine + 1, *saveNames[selectedLine]);
-		else
+			if (!doneFlag)
+				errorFlag = 1;
+		} else {
 			doneFlag = engine.loadGame(selectedLine + 1);
+			if (!doneFlag)
+				errorFlag = 2;
+		}
 	}
 
 	mouse.popCursor();
@@ -866,6 +872,16 @@
 	for (index = 0; index < numSaves; ++index) delete saveNames[index];
 	Memory::dealloc(saveNames);
 
+	if (errorFlag != 0) {
+		Room::getReference().update();
+		screen.update();
+
+		if (errorFlag == 1)
+			Dialog::show("Error occurred saving the game");
+		else if (errorFlag == 2)
+			Dialog::show("Error occurred loading the savegame");
+	}
+
 	return doneFlag;
 }
 


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