libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-13 21:31:53 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

GLK: ADVSYS: Added code for loading savegames from launcher

Browse Source
This commit is contained in:
Paul Gilbert 2019-06-15 14:28:56 -07:00
parent f80c11cf34
commit acc90002f6
4 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
engines/glk/advsys/advsys.cpp
View File

@ -22,11 +22,15 @@
#include "glk/advsys/advsys.h"
#include "common/translation.h"
#include "common/config-manager.h"
namespace Glk {
namespace AdvSys {
void AdvSys::runGame() {
// Check for savegame
_saveSlot = ConfMan.hasKey("save_slot") ? ConfMan.getInt("save_slot") : -1;
if (!initialize()) {
GUIErrorMessage(_("Could not start AdvSys game"));
return;
@ -37,6 +41,13 @@ void AdvSys::runGame() {
// Run game startup
execute(_initCodeOffset);
if (_saveSlot != -1) {
Common::ErrorCode err = loadGameState(_saveSlot).getCode();
_saveSlot = -1;
if (err != Common::kNoError)
print(_("Sorry, the savegame couldn't be restored"));
}
// Gameplay loop
while (!shouldQuit() && !shouldRestart()) {
// Run update code

5
engines/glk/advsys/glk_interface.cpp
View File

@ -31,7 +31,10 @@ bool GlkInterface::initialize() {
}
void GlkInterface::print(const Common::String &msg) {
glk_put_string_stream(glk_window_get_stream(_window), msg.c_str());
// Don't print out text if loading a savegame directly from the launcher, since we don't
// want any of the intro text displayed by the startup code to show
if (_saveSlot == -1)
glk_put_string_stream(glk_window_get_stream(_window), msg.c_str());
}
void GlkInterface::print(int number) {

5
engines/glk/advsys/glk_interface.h
View File

@ -35,6 +35,8 @@ namespace AdvSys {
class GlkInterface : public GlkAPI {
private:
winid_t _window;
protected:
int _saveSlot;
protected:
/**
* GLK initialization
@ -61,7 +63,8 @@ public:
/**
* Constructor
*/
GlkInterface(OSystem *syst, const GlkGameDescription &gameDesc) : GlkAPI(syst, gameDesc) {}
GlkInterface(OSystem *syst, const GlkGameDescription &gameDesc) : GlkAPI(syst, gameDesc),
_saveSlot(-1) {}
};
} // End of namespace AdvSys

4
engines/glk/advsys/vm.cpp
View File

@ -310,12 +310,12 @@ void VM::opYORN() {
void VM::opSAVE() {
if (saveGame().getCode() != Common::kNoError)
print("Sorry, the savegame couldn't be created");
print(_("Sorry, the savegame couldn't be created"));
}
void VM::opRESTORE() {
if (saveGame().getCode() != Common::kNoError)
print("Sorry, the savegame couldn't be restored");
print(_("Sorry, the savegame couldn't be restored"));
}
void VM::opARG() {