libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-04-01 14:21:41 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

GLK: JACL: Implement loading saves from the launcher

Browse Source
This commit is contained in:
Paul Gilbert 2019-10-09 21:50:30 -07:00
parent d41d11f390
commit e779ebce4f
4 changed files with 85 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
engines/glk/jacl/interpreter.cpp
View File

@ -1094,7 +1094,7 @@ int execute(const char *funcname) {
noproprun();
return (exit_function(TRUE));
} else {
if (g_vm->glk_image_draw(mainwin, (glui32) value_of(word[1], TRUE), imagealign_InlineDown, 0) == 0) {
if (!g_vm->loadingSavegame() && g_vm->glk_image_draw(mainwin, (glui32) value_of(word[1], TRUE), imagealign_InlineDown, 0) == 0) {
sprintf(error_buffer, "Unable to draw image: %ld", value_of(word[1], FALSE));
log_error(error_buffer, PLUS_STDERR);
}

12
engines/glk/jacl/jacl.cpp
View File

@ -22,6 +22,7 @@
#include "glk/jacl/jacl.h"
#include "glk/jacl/prototypes.h"
#include "glk/jacl/types.h"
#include "common/config-manager.h"
namespace Glk {
@ -68,5 +69,16 @@ Common::Error JACL::writeGameData(Common::WriteStream *ws) {
return success ? Common::kNoError : Common::kWritingFailed;
}
bool JACL::loadLauncherSavegame() {
int saveSlot = _saveSlot;
_saveSlot = -1;
if (loadGameState(saveSlot).getCode() == Common::kNoError)
return true;
write_text(cstring_resolve("CANT_RESTORE")->value);
return false;
}
} // End of namespace JACL
} // End of namespace Glk

5
engines/glk/jacl/jacl.h
View File

@ -80,6 +80,11 @@ public:
bool loadingSavegame() const {
return _saveSlot != -1;
}
/**
* Does the actual loading of the savegame from a luancher
*/
bool loadLauncherSavegame();
};
extern JACL *g_vm;

120
engines/glk/jacl/jacl_main.cpp
View File

@ -262,6 +262,7 @@ void glk_main() {
return;
}
/* DUMMY RETRIEVE OF 'HERE' FOR TESTING OF GAME STATE */
get_here();
@ -289,70 +290,82 @@ void glk_main() {
jacl_set_window(inputwin);
}
/* OUTPUT THE CUSTOM COMMAND PROMPT */
write_text(string_resolve("command_prompt")->value);
// If loading a savegame from the launcher, do it now
if (g_vm->loadingSavegame()) {
// Load the game
if (g_vm->loadLauncherSavegame()) {
// Do a look action
const uint32 LOOK[5] = { 'l', 'o', 'o', 'k', 0 };
Common::copy(LOOK, LOOK + 5, command_buffer_uni);
ev.val1 = 4;
} else {
continue;
}
} else {
/* OUTPUT THE CUSTOM COMMAND PROMPT */
write_text(string_resolve("command_prompt")->value);
#ifdef NOUNICODE
g_vm->glk_request_line_event(inputwin, command_buffer, 255, 0);
g_vm->glk_request_line_event(inputwin, command_buffer, 255, 0);
#else
g_vm->glk_request_line_event_uni(inputwin, command_buffer_uni, 255, 0);
g_vm->glk_request_line_event_uni(inputwin, command_buffer_uni, 255, 0);
#endif
jacl_set_window(inputwin);
jacl_set_window(inputwin);
gotline = FALSE;
gotline = FALSE;
while (!gotline) {
/* GRAB AN EVENT. */
g_vm->glk_select(&ev);
if (g_vm->shouldQuit())
return;
while (!gotline) {
/* GRAB AN EVENT. */
g_vm->glk_select(&ev);
if (g_vm->shouldQuit())
return;
switch (ev.type) {
switch (ev.type) {
case evtype_LineInput:
if (ev.window == inputwin) {
gotline = TRUE;
jacl_set_window(mainwin);
/* REALLY THE EVENT CAN *ONLY* BE FROM MAINWIN,
* BECAUSE WE NEVER REQUEST LINE INPUT FROM THE
* STATUS WINDOW. BUT WE DO A PARANOIA TEST,
* BECAUSE COMMANDBUF IS ONLY FILLED IF THE LINE
* EVENT COMES FROM THE MAINWIN REQUEST. IF THE
* LINE EVENT COMES FROM ANYWHERE ELSE, WE IGNORE
* IT. */
}
break;
case evtype_SoundNotify:
/* A SOUND HAS FINISHED PLAYING CALL +sound_finished
* WITH THE RESOUCE NUMBER AS THE FIRST ARGUMENT
* AND THE CHANNEL NUMBER AS THE SECOND ARGUMENT */
sprintf(temp_buffer, "+sound_finished<%d<%d", (int) ev.val1, (int) ev.val2 - 1);
execute(temp_buffer);
break;
case evtype_Timer:
/* A TIMER EVENT IS TRIGGERED PERIODICALLY IF THE GAME
* REQUESTS THEM. THIS SIMPLY EXECUTES THE FUNCTION
* +timer WHICH IS LIKE +eachturn EXCEPT IT DOESN'T
* WAIT FOR THE PLAYER TO TYPE A COMMAND */
case evtype_LineInput:
if (ev.window == inputwin) {
gotline = TRUE;
jacl_set_window(mainwin);
/* REALLY THE EVENT CAN *ONLY* BE FROM MAINWIN,
* BECAUSE WE NEVER REQUEST LINE INPUT FROM THE
* STATUS WINDOW. BUT WE DO A PARANOIA TEST,
* BECAUSE COMMANDBUF IS ONLY FILLED IF THE LINE
* EVENT COMES FROM THE MAINWIN REQUEST. IF THE
* LINE EVENT COMES FROM ANYWHERE ELSE, WE IGNORE
* IT. */
execute("+timer");
break;
case evtype_Arrange:
/* WINDOWS HAVE CHANGED SIZE, SO WE HAVE TO REDRAW THE
* STATUS WINDOW. */
status_line();
break;
default:
break;
}
break;
case evtype_SoundNotify:
/* A SOUND HAS FINISHED PLAYING CALL +sound_finished
* WITH THE RESOUCE NUMBER AS THE FIRST ARGUMENT
* AND THE CHANNEL NUMBER AS THE SECOND ARGUMENT */
sprintf(temp_buffer, "+sound_finished<%d<%d", (int) ev.val1, (int) ev.val2 - 1);
execute(temp_buffer);
break;
case evtype_Timer:
/* A TIMER EVENT IS TRIGGERED PERIODICALLY IF THE GAME
* REQUESTS THEM. THIS SIMPLY EXECUTES THE FUNCTION
* +timer WHICH IS LIKE +eachturn EXCEPT IT DOESN'T
* WAIT FOR THE PLAYER TO TYPE A COMMAND */
jacl_set_window(mainwin);
execute("+timer");
break;
case evtype_Arrange:
/* WINDOWS HAVE CHANGED SIZE, SO WE HAVE TO REDRAW THE
* STATUS WINDOW. */
status_line();
break;
default:
break;
}
}
// THE PLAYER'S INPUT WILL BE UTF-32. CONVERT IT TO UTF-8 AND NULL TERMINATE IT
#ifndef NOUNICODE
convert_to_utf8(command_buffer_uni, ev.val1);
@ -707,8 +720,9 @@ void restore_game_state() {
}
void write_text(const char *string_buffer) {
int index,
length;
int index, length;
if (g_vm->loadingSavegame())
return;
if (!strcmp(string_buffer, "tilde")) {
g_vm->glk_put_string("~");