Navigation Menu

Skip to content

Commit

Permalink
GLK: JACL: Hooking up savegame code to GMM
Browse files Browse the repository at this point in the history
  • Loading branch information
@dreammaster
dreammaster committed Oct 8, 2019
1 parent 2d2a674 commit 1342fce
Show file tree
Hide file tree
Showing 5 changed files with 70 additions and 152 deletions.
138 changes: 52 additions & 86 deletions engines/glk/jacl/glk_saver.cpp
View file
Expand Up @@ -52,38 +52,25 @@ extern int parent;

extern int noun[];

int save_game(frefid_t saveref) {
struct integer_type *current_integer = integer_table;
struct function_type *current_function = function_table;
struct string_type *current_string = string_table;

int index, counter;
strid_t bookmark = NULL;

bookmark = g_vm->glk_stream_open_file(saveref, filemode_Write, 0);

if (bookmark == NULL) {
return (FALSE);
}

/* WE'RE DONE WITH THE FILE REFERENCE NOW THAT THE STREAM
* HAS BEEN SUCCESSFULLY OPENED */
g_vm->glk_fileref_destroy(saveref);

/* THIS IS WRITTEN TO HELP VALIDATE THE SAVED GAME
* BEFORE CONTINUING TO LOAD IT */
write_integer(bookmark, objects);
write_integer(bookmark, integers);
write_integer(bookmark, functions);
write_integer(bookmark, strings);
bool save_game(strid_t save) {
integer_type *current_integer = integer_table;
function_type *current_function = function_table;
string_type *current_string = string_table;
int index, counter;

// This is written to help validate the saved game when it's loaded
write_integer(save, objects);
write_integer(save, integers);
write_integer(save, functions);
write_integer(save, strings);

while (current_integer != NULL) {
write_integer(bookmark, current_integer->value);
write_integer(save, current_integer->value);
current_integer = current_integer->next_integer;
}

while (current_function != NULL) {
write_integer(bookmark, current_function->call_count);
write_integer(save, current_function->call_count);
current_function = current_function->next_function;
}

Expand All @@ -92,68 +79,50 @@ int save_game(frefid_t saveref) {
continue;

for (counter = 0; counter < 16; counter++) {
write_integer(bookmark, object[index]->integer[counter]);
write_integer(save, object[index]->integer[counter]);
}

write_long(bookmark, object[index]->attributes);
write_long(bookmark, object[index]->user_attributes);
write_long(save, object[index]->attributes);
write_long(save, object[index]->user_attributes);
}

/* WRITE OUT ALL THE CURRENT VALUES OF THE STRING VARIABLES */
// Write out all the current values of the string variables
while (current_string != NULL) {
for (index = 0; index < 255; index++) {
g_vm->glk_put_char_stream(bookmark, current_string->value[index]);
g_vm->glk_put_char_stream(save, current_string->value[index]);
}
current_string = current_string->next_string;
}

write_integer(bookmark, player);
write_integer(bookmark, noun[3]);
write_integer(save, player);
write_integer(save, noun[3]);

/* SAVE THE CURRENT VOLUME OF EACH OF THE SOUND CHANNELS */
// Save the current volume of each of the sound channels
for (index = 0; index < 8; index++) {
sprintf(temp_buffer, "volume[%d]", index);
write_integer(bookmark, cinteger_resolve(temp_buffer)->value);
write_integer(save, cinteger_resolve(temp_buffer)->value);
}

/* SAVE THE CURRENT VALUE OF THE GLK TIMER */
write_integer(bookmark, cinteger_resolve("timer")->value);

/* CLOSE THE STREAM */
g_vm->glk_stream_close(bookmark, NULL);
// Save the current value of the GLK timer
write_integer(save, cinteger_resolve("timer")->value);

TIME->value = FALSE;
return (TRUE);
return true;
}

int restore_game(frefid_t saveref, int warn) {
struct integer_type *current_integer = integer_table;
struct function_type *current_function = function_table;
struct string_type *current_string = string_table;

int index, counter;
int file_objects,
file_integers,
file_functions,
file_strings;
strid_t bookmark;
bool restore_game(strid_t save, bool warn) {
integer_type *current_integer = integer_table;
function_type *current_function = function_table;
string_type *current_string = string_table;

bookmark = g_vm->glk_stream_open_file(saveref, filemode_Read, 0);
int index, counter;
int file_objects, file_integers, file_functions, file_strings;

if (!bookmark) {
return (FALSE);
}

/* WE'RE DONE WITH THE FILE REFERENCE NOW THAT THE STREAM
* HAS BEEN SUCCESSFULLY OPENED */
g_vm->glk_fileref_destroy(saveref);

/* THIS IS WRITTEN TO HELP VALIDATE THE SAVED GAME
* BEFORE CONTINUING TO LOAD IT */
file_objects = read_integer(bookmark);
file_integers = read_integer(bookmark);
file_functions = read_integer(bookmark);
file_strings = read_integer(bookmark);
// Read properties to validate the savegame is for this game
file_objects = read_integer(save);
file_integers = read_integer(save);
file_functions = read_integer(save);
file_strings = read_integer(save);

if (file_objects != objects
|| file_integers != integers
Expand All @@ -162,17 +131,17 @@ int restore_game(frefid_t saveref, int warn) {
if (warn == FALSE) {
log_error(cstring_resolve("BAD_SAVED_GAME")->value, PLUS_STDOUT);
}
g_vm->glk_stream_close(bookmark, NULL);
g_vm->glk_stream_close(save, NULL);
return (FALSE);
}

while (current_integer != NULL) {
current_integer->value = read_integer(bookmark);
current_integer->value = read_integer(save);
current_integer = current_integer->next_integer;
}

while (current_function != NULL) {
current_function->call_count = read_integer(bookmark);
current_function->call_count = read_integer(save);
current_function = current_function->next_function;
}

Expand All @@ -181,47 +150,44 @@ int restore_game(frefid_t saveref, int warn) {
continue;

for (counter = 0; counter < 16; counter++) {
object[index]->integer[counter] = read_integer(bookmark);
object[index]->integer[counter] = read_integer(save);
}

object[index]->attributes = read_integer(bookmark);
object[index]->user_attributes = read_integer(bookmark);
object[index]->attributes = read_integer(save);
object[index]->user_attributes = read_integer(save);
}

while (current_string != NULL) {
for (index = 0; index < 255; index++) {
current_string->value[index] = g_vm->glk_get_char_stream(bookmark);
current_string->value[index] = g_vm->glk_get_char_stream(save);
}
current_string = current_string->next_string;
}

player = read_integer(bookmark);
noun[3] = read_integer(bookmark);
player = read_integer(save);
noun[3] = read_integer(save);

/* RESTORE THE CURRENT VOLUME OF EACH OF THE SOUND CHANNELS */
// Restore the current volume of each of the sound channels
for (index = 0; index < 8; index++) {
sprintf(temp_buffer, "volume[%d]", index);
counter = read_integer(bookmark);
counter = read_integer(save);
cinteger_resolve(temp_buffer)->value = counter;

if (SOUND_SUPPORTED->value) {
/* SET THE GLK VOLUME */
// Set the GLK volume
g_vm->glk_schannel_set_volume(sound_channel[index], (glui32) counter);
}
}

/* RESTORE THE CURRENT VALUE OF THE GLK TIMER */
counter = read_integer(bookmark);
// Restore the current value of the GLK timer
counter = read_integer(save);
cinteger_resolve("timer")->value = counter;

/* SET THE GLK TIMER */
// Set the GLK timer
g_vm->glk_request_timer_events((glui32) counter);

/* CLOSE THE STREAM */
g_vm->glk_stream_close(bookmark, NULL);

TIME->value = FALSE;
return (TRUE);
return true;
}

void write_integer(strid_t stream, int x) {
Expand Down
12 changes: 2 additions & 10 deletions engines/glk/jacl/interpreter.cpp
View file
Expand Up @@ -1798,11 +1798,7 @@ int execute(const char *funcname) {
unkvarrun(word[1]);
return (exit_function(TRUE));
} else {
if (word[2] == NULL) {
*container = save_interaction(NULL);
} else {
*container = save_interaction(arg_text_of_word(2));
}
*container = save_interaction();
}
}
} else if (!strcmp(word[0], "restoregame")) {
Expand All @@ -1815,11 +1811,7 @@ int execute(const char *funcname) {
unkvarrun(word[1]);
return (exit_function(TRUE));
} else {
if (word[2] == NULL) {
*container = restore_interaction(NULL);
} else {
*container = restore_interaction(arg_text_of_word(2));
}
*container = restore_interaction();
}
}
} else if (!strcmp(word[0], "restartgame")) {
Expand Down
7 changes: 6 additions & 1 deletion engines/glk/jacl/jacl.cpp
View file
Expand Up @@ -21,6 +21,7 @@
*/

#include "glk/jacl/jacl.h"
#include "glk/jacl/prototypes.h"
#include "common/config-manager.h"

namespace Glk {
Expand Down Expand Up @@ -56,7 +57,11 @@ Common::Error JACL::readSaveData(Common::SeekableReadStream *rs) {
}

Common::Error JACL::writeGameData(Common::WriteStream *ws) {
return Common::kNoError;
strid_t data_stream = _streams->openStream(ws);
bool success = save_game(data_stream);
_streams->deleteStream(data_stream);

return success ? Common::kNoError : Common::kWritingFailed;
}

} // End of namespace JACL
Expand Down
55 changes: 5 additions & 50 deletions engines/glk/jacl/jacl_main.cpp
View file
Expand Up @@ -651,35 +651,12 @@ void save_game_state() {
noun3_backup = noun[3];
}

int save_interaction(const char *filename) {
frefid_t saveref;

jacl_set_window(inputwin);

if (inputwin == promptwin) {
g_vm->glk_window_clear(promptwin);
newline();
}

if (filename == NULL) {
saveref = g_vm->glk_fileref_create_by_prompt(fileusage_SavedGame | fileusage_BinaryMode, filemode_Write, 0);
int save_interaction() {
if (g_vm->saveGame().getCode() == Common::kNoError) {
return (TRUE);
} else {
saveref = g_vm->glk_fileref_create_by_name(fileusage_SavedGame | fileusage_BinaryMode, filename, 0);

}

jacl_set_window(mainwin);

if (!saveref) {
write_text(cstring_resolve("CANT_SAVE")->value);
return (FALSE);
} else {
if (save_game(saveref)) {
return (TRUE);
} else {
write_text(cstring_resolve("CANT_SAVE")->value);
return (FALSE);
}
}
}

Expand Down Expand Up @@ -1237,30 +1214,8 @@ void walking_thru() {
walkthru_running = FALSE;
}

int restore_interaction(const char *filename) {
frefid_t saveref;

jacl_set_window(inputwin);

if (inputwin == promptwin) {
g_vm->glk_window_clear(promptwin);
newline();
}

if (filename == NULL) {
saveref = g_vm->glk_fileref_create_by_prompt(fileusage_SavedGame | fileusage_BinaryMode, filemode_Read, 0);
} else {
saveref = g_vm->glk_fileref_create_by_name(fileusage_SavedGame | fileusage_BinaryMode, filename, 0);
}

jacl_set_window(mainwin);

if (!saveref) {
write_text(cstring_resolve("CANT_RESTORE")->value);
return (FALSE);
}

if (restore_game(saveref, TRUE) == FALSE) {
int restore_interaction() {
if (g_vm->loadGame().getCode() != Common::kNoError) {
write_text(cstring_resolve("CANT_RESTORE")->value);
return (FALSE);
} else {
Expand Down
10 changes: 5 additions & 5 deletions engines/glk/jacl/prototypes.h
View file
Expand Up @@ -73,11 +73,11 @@ extern char get_character(const char *message);
extern int get_yes_or_no();
extern void get_string(char *string_buffer);
extern int get_number(int insist, int low, int high);
extern int save_interaction(const char *filename);
extern int restore_interaction(const char *filename);
extern int save_interaction();
extern int restore_interaction();
extern void jacl_encrypt(char *string);
extern void jacl_decrypt(char *string);
extern void log_message(const char *message, int console);
//extern void log_message(const char *message, int console);
extern void set_them(int noun_number);
extern void preparse();
extern void inspect(int object_num);
Expand Down Expand Up @@ -144,8 +144,8 @@ extern void push_proxy();
extern void write_text(const char *string_buffer);
extern void status_line();
extern void newline();
extern int save_game(frefid_t saveref);
extern int restore_game(frefid_t saveref, int warn);
extern bool save_game(strid_t save);
extern bool restore_game(strid_t save, bool warn = false);
extern void write_integer(strid_t stream, int x);
extern int read_integer(strid_t stream);
extern void write_long(strid_t stream, long x);
Expand Down

0 comments on commit 1342fce

Please sign in to comment.