From 5eb0390aca85a53a6bc268e082b776119ca9b997 Mon Sep 17 00:00:00 2001 From: Paul Gilbert Date: Sun, 23 Jun 2019 16:15:00 -0700 Subject: GLK: ALAN2: Add loading savegames from launcher, deinitialization code --- engines/glk/alan2/main.cpp | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'engines/glk/alan2/main.cpp') 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) { -- cgit v1.2.3