diff options
| author | Paul Gilbert | 2019-06-23 16:15:00 -0700 |
|---|---|---|
| committer | Paul Gilbert | 2019-06-23 16:19:42 -0700 |
| commit | 5eb0390aca85a53a6bc268e082b776119ca9b997 (patch) | |
| tree | 33898f1d7487676ce2c24f1b2490e08f4549964a /engines/glk/alan2/main.cpp | |
| parent | e7fbd9268c9bd4a21a9f4741d4636c722368847c (diff) | |
| download | scummvm-rg350-5eb0390aca85a53a6bc268e082b776119ca9b997.tar.gz scummvm-rg350-5eb0390aca85a53a6bc268e082b776119ca9b997.tar.bz2 scummvm-rg350-5eb0390aca85a53a6bc268e082b776119ca9b997.zip | |
GLK: ALAN2: Add loading savegames from launcher, deinitialization code
Diffstat (limited to 'engines/glk/alan2/main.cpp')
| -rw-r--r-- | engines/glk/alan2/main.cpp | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/engines/glk/alan2/main.cpp b/engines/glk/alan2/main.cpp index 58c483a852..551fbe5b59 100644 --- a/engines/glk/alan2/main.cpp +++ b/engines/glk/alan2/main.cpp @@ -116,9 +116,6 @@ Boolean skipsp = FALSE; */ void terminate(CONTEXT, int code) { newline(); - free(memory); - if (logflg) - fclose(logfil); g_vm->glk_exit(); LONG_JUMP @@ -1404,6 +1401,13 @@ void run() { g_vm->setRestart(false); init(); + if (g_vm->_saveSlot != -1) { + if (g_vm->loadGameState(g_vm->_saveSlot).getCode() != Common::kNoError) + return; + g_vm->_saveSlot = -1; + g_vm->_pendingLook = true; + } + Context ctx; while (!g_vm->shouldQuit() && !g_vm->shouldRestart()) { if (!ctx._break) { |