[Scummvm-git-logs] scummvm master -> c5e3ccbca2dbc5c9282b278903afeaaf62dc889b

[dreammaster]

This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
54753ffce9 GLK: JACL: Fix loading savegames
c5e3ccbca2 GLK: JACL: Amiga compilation fix


Commit: 54753ffce9caf2bc67d6584b9a694eabad611fbc
    https://github.com/scummvm/scummvm/commit/54753ffce9caf2bc67d6584b9a694eabad611fbc
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2019-10-09T19:26:42-07:00

Commit Message:
GLK: JACL: Fix loading savegames

Changed paths:
    engines/glk/jacl/jacl.cpp


diff --git a/engines/glk/jacl/jacl.cpp b/engines/glk/jacl/jacl.cpp
index 0e97f59..daeffe9 100644
--- a/engines/glk/jacl/jacl.cpp
+++ b/engines/glk/jacl/jacl.cpp
@@ -53,7 +53,11 @@ void JACL::deinitialize() {
 }
 
 Common::Error JACL::readSaveData(Common::SeekableReadStream *rs) {
-	return Common::kNoError;
+	strid_t data_stream = _streams->openStream(rs);
+	bool success = restore_game(data_stream);
+	_streams->deleteStream(data_stream);
+
+	return success ? Common::kNoError : Common::kReadingFailed;
 }
 
 Common::Error JACL::writeGameData(Common::WriteStream *ws) {


Commit: c5e3ccbca2dbc5c9282b278903afeaaf62dc889b
    https://github.com/scummvm/scummvm/commit/c5e3ccbca2dbc5c9282b278903afeaaf62dc889b
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2019-10-09T19:26:42-07:00

Commit Message:
GLK: JACL: Amiga compilation fix

Changed paths:
    engines/glk/jacl/jacl_main.cpp
    engines/glk/jacl/resolvers.cpp


diff --git a/engines/glk/jacl/jacl_main.cpp b/engines/glk/jacl/jacl_main.cpp
index 7221986..bc8690a 100644
--- a/engines/glk/jacl/jacl_main.cpp
+++ b/engines/glk/jacl/jacl_main.cpp
@@ -32,7 +32,7 @@ namespace JACL {
 
 int convert_to_utf32(unsigned char *text);
 
-glui32              status_width, status_height;
+uint                status_width, status_height;
 
 schanid_t           sound_channel[8] = { NULL, NULL, NULL, NULL,
                                          NULL, NULL, NULL, NULL
diff --git a/engines/glk/jacl/resolvers.cpp b/engines/glk/jacl/resolvers.cpp
index 6d119de..6e277ca 100644
--- a/engines/glk/jacl/resolvers.cpp
+++ b/engines/glk/jacl/resolvers.cpp
@@ -29,7 +29,7 @@ namespace Glk {
 namespace JACL {
 
 #ifdef GLK
-extern glui32                   status_width, status_height;
+extern uint                     status_width, status_height;
 extern winid_t                  statuswin;
 #endif