diff options
author | Max Horn | 2009-07-20 05:02:17 +0000 |
---|---|---|
committer | Max Horn | 2009-07-20 05:02:17 +0000 |
commit | 9e3d42c0cf93cb45126166c43294be710ec1fed7 (patch) | |
tree | a617f17d72c635d8b8adf80e9a1a3336976a2a77 | |
parent | 00af395ab6a07250c7f3e7b8870cf328c72cde47 (diff) | |
download | scummvm-rg350-9e3d42c0cf93cb45126166c43294be710ec1fed7.tar.gz scummvm-rg350-9e3d42c0cf93cb45126166c43294be710ec1fed7.tar.bz2 scummvm-rg350-9e3d42c0cf93cb45126166c43294be710ec1fed7.zip |
AGOS: Fixed badload(); some whitespace cleanup
svn-id: r42624
-rw-r--r-- | engines/agos/saveload.cpp | 11 | ||||
-rw-r--r-- | engines/agos/script_pn.cpp | 3 |
2 files changed, 7 insertions, 7 deletions
diff --git a/engines/agos/saveload.cpp b/engines/agos/saveload.cpp index 92632775f9..3787617be7 100644 --- a/engines/agos/saveload.cpp +++ b/engines/agos/saveload.cpp @@ -229,7 +229,7 @@ bool AGOSEngine::confirmOverWrite(WindowBlock *window) { 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 @@ bool AGOSEngine_Elvira2::saveGame(uint slot, const char *caption) { #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 @@ printf("badload(%d)\n", errorNum); // Restart from process 1 _tagOfActiveDoline = 1; - _dolineReturnVal = 2; + _dolineReturnVal = 3; return 1; } @@ -1574,7 +1573,7 @@ void AGOSEngine_PN::getFilename() { 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 @@ int AGOSEngine_PN::loadFile(char *name) { delete f; return -1; } - delete f; + delete f; restartAnimation(); dbtosysf(); return 0; @@ -1627,7 +1626,7 @@ int AGOSEngine_PN::saveFile(char *name) { restartAnimation(); const char *msg = "Couldn't save. "; - pcf((unsigned char)'\n'); + pcf((unsigned char)'\n'); while (*msg) pcf((unsigned char)*msg++); diff --git a/engines/agos/script_pn.cpp b/engines/agos/script_pn.cpp index e8b72fc50c..2885781a9f 100644 --- a/engines/agos/script_pn.cpp +++ b/engines/agos/script_pn.cpp @@ -916,7 +916,8 @@ int AGOSEngine_PN::doline(int needsave) { _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; |