[Scummvm-cvs-logs] SF.net SVN: scummvm:[42624] scummvm/trunk/engines/agos

[fingolfin at users.sourceforge.net]

Revision: 42624
          http://scummvm.svn.sourceforge.net/scummvm/?rev=42624&view=rev
Author:   fingolfin
Date:     2009-07-20 05:02:17 +0000 (Mon, 20 Jul 2009)

Log Message:
-----------
AGOS: Fixed badload(); some whitespace cleanup

Modified Paths:
--------------
    scummvm/trunk/engines/agos/saveload.cpp
    scummvm/trunk/engines/agos/script_pn.cpp

Modified: scummvm/trunk/engines/agos/saveload.cpp
===================================================================
--- scummvm/trunk/engines/agos/saveload.cpp	2009-07-19 21:06:25 UTC (rev 42623)
+++ scummvm/trunk/engines/agos/saveload.cpp	2009-07-20 05:02:17 UTC (rev 42624)
@@ -229,7 +229,7 @@
 		break;
 	case Common::DE_DEU:
 		message1 = "\rDatei existiert bereits.\r\r";
-		message2 = "     berschreiben ?\r\r";
+		message2 = "   Ueberschreiben ?\r\r";
 		message3 = "     Ja        Nein";
 		break;
 	default:
@@ -1551,7 +1551,6 @@
 #ifdef ENABLE_PN
 // Personal Nightmare specific
 bool AGOSEngine_PN::badload(int8 errorNum) {
-printf("badload(%d)\n", errorNum);
 	if (errorNum == -2)
 		return 0;
 	// Load error recovery routine
@@ -1563,7 +1562,7 @@
 
 	// Restart from process 1
 	_tagOfActiveDoline = 1;
-	_dolineReturnVal = 2;
+	_dolineReturnVal = 3;
 	return 1;
 }
 
@@ -1574,7 +1573,7 @@
 	memset(_saveFile, 0, sizeof(_saveFile));
 	while (!shouldQuit() && !strlen(_saveFile)) {
 		const char *msg = "File name : ";
-	        pcf((unsigned char)'\n');
+		pcf((unsigned char)'\n');
 		while (*msg)
 			pcf((unsigned char)*msg++);
 
@@ -1611,7 +1610,7 @@
 		delete f;
 		return -1;
 	}
-		delete f;
+	delete f;
 	restartAnimation();
 	dbtosysf();
 	return 0;
@@ -1627,7 +1626,7 @@
 		restartAnimation();
 
 		const char *msg = "Couldn't save. ";
-	        pcf((unsigned char)'\n');
+		pcf((unsigned char)'\n');
 		while (*msg)
 			pcf((unsigned char)*msg++);
 

Modified: scummvm/trunk/engines/agos/script_pn.cpp
===================================================================
--- scummvm/trunk/engines/agos/script_pn.cpp	2009-07-19 21:06:25 UTC (rev 42623)
+++ scummvm/trunk/engines/agos/script_pn.cpp	2009-07-20 05:02:17 UTC (rev 42624)
@@ -916,7 +916,8 @@
 				_dolineReturnVal = 0;
 
 				if (x > 0) {
-					dumpstack();
+					if (x != 3)
+						dumpstack();
 					// Restore the active jmpbuf to its previous value,
 					// then return _dolineReturnVal-1 (will be 2-1=1 or 1-1=0).
 					_tagOfActiveDoline = myTag - 1;


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