aboutsummaryrefslogtreecommitdiff
path: root/engines/touche
diff options
context:
space:
mode:
authorMax Horn2008-11-03 18:32:16 +0000
committerMax Horn2008-11-03 18:32:16 +0000
commit55c10e0ec6f2d6ea7c58ec1e4b74e5552fda5ddc (patch)
tree4df4d54fc783f837004ab2419c90aaf5c7f5930a /engines/touche
parent646666125232064f2c4657c4025433b243e42af9 (diff)
downloadscummvm-rg350-55c10e0ec6f2d6ea7c58ec1e4b74e5552fda5ddc.tar.gz
scummvm-rg350-55c10e0ec6f2d6ea7c58ec1e4b74e5552fda5ddc.tar.bz2
scummvm-rg350-55c10e0ec6f2d6ea7c58ec1e4b74e5552fda5ddc.zip
Patch #2122869: ALL: Common load dialog
svn-id: r34883
Diffstat (limited to 'engines/touche')
-rw-r--r--engines/touche/menu.cpp2
-rw-r--r--engines/touche/saveload.cpp4
-rw-r--r--engines/touche/touche.h2
3 files changed, 4 insertions, 4 deletions
diff --git a/engines/touche/menu.cpp b/engines/touche/menu.cpp
index 9da76dadde..2d7af18da3 100644
--- a/engines/touche/menu.cpp
+++ b/engines/touche/menu.cpp
@@ -331,7 +331,7 @@ void ToucheEngine::handleMenuAction(void *menu, int actionId) {
break;
case kActionPerformSaveLoad:
if (menuData->mode == kMenuLoadStateMode) {
- if (loadGameState(_saveLoadCurrentSlot)) {
+ if (loadGameState(_saveLoadCurrentSlot) == 0) {
menuData->quit = true;
}
} else if (menuData->mode == kMenuSaveStateMode) {
diff --git a/engines/touche/saveload.cpp b/engines/touche/saveload.cpp
index fedd40eb76..011e739c35 100644
--- a/engines/touche/saveload.cpp
+++ b/engines/touche/saveload.cpp
@@ -340,7 +340,7 @@ bool ToucheEngine::saveGameState(int num, const char *description) {
return saveOk;
}
-bool ToucheEngine::loadGameState(int num) {
+int ToucheEngine::loadGameState(int num) {
bool loadOk = false;
char gameStateFileName[64];
generateGameStateFileName(num, gameStateFileName, 63);
@@ -360,7 +360,7 @@ bool ToucheEngine::loadGameState(int num) {
}
delete f;
}
- return loadOk;
+ return loadOk ? 0 : 1;
}
void ToucheEngine::readGameStateDescription(int num, char *description, int len) {
diff --git a/engines/touche/touche.h b/engines/touche/touche.h
index f341769422..707eedbb38 100644
--- a/engines/touche/touche.h
+++ b/engines/touche/touche.h
@@ -496,7 +496,7 @@ protected:
void saveGameStateData(Common::WriteStream *stream);
void loadGameStateData(Common::ReadStream *stream);
bool saveGameState(int num, const char *description);
- bool loadGameState(int num);
+ int loadGameState(int num);
void readGameStateDescription(int num, char *description, int len);
void generateGameStateFileName(int num, char *dst, int len, bool prefixOnly = false) const;
int getGameStateFileSlot(const char *filename) const;