diff options
| author | Max Horn | 2010-01-30 19:06:24 +0000 |
|---|---|---|
| committer | Max Horn | 2010-01-30 19:06:24 +0000 |
| commit | 4f4b559d1cf9ecabe7d395428e14518ee7ed664d (patch) | |
| tree | f4fe8acb9677ce958ffaf20f00bb308164150b40 | |
| parent | d0bcf4d281f503f7a7d74d8595c85958b0f26bd3 (diff) | |
| download | scummvm-rg350-4f4b559d1cf9ecabe7d395428e14518ee7ed664d.tar.gz scummvm-rg350-4f4b559d1cf9ecabe7d395428e14518ee7ed664d.tar.bz2 scummvm-rg350-4f4b559d1cf9ecabe7d395428e14518ee7ed664d.zip | |
SCI: Correct comments which talked about 'loading from GMM' when they really meant 'loading from launcher'
svn-id: r47725
| -rw-r--r-- | engines/sci/engine/kfile.cpp | 2 | ||||
| -rw-r--r-- | engines/sci/engine/vm.cpp | 16 |
2 files changed, 9 insertions, 9 deletions
diff --git a/engines/sci/engine/kfile.cpp b/engines/sci/engine/kfile.cpp index 214b810ca8..0860466d32 100644 --- a/engines/sci/engine/kfile.cpp +++ b/engines/sci/engine/kfile.cpp @@ -608,7 +608,7 @@ reg_t kRestoreGame(EngineState *s, int argc, reg_t *argv) { savedir_nr = saves[savedir_nr].id; } else { - // Loading from GMM, no change necessary + // Loading from launcher, no change necessary } if (savedir_nr > -1) { diff --git a/engines/sci/engine/vm.cpp b/engines/sci/engine/vm.cpp index a57044564f..06cfc0b6b0 100644 --- a/engines/sci/engine/vm.cpp +++ b/engines/sci/engine/vm.cpp @@ -543,10 +543,10 @@ void run_vm(EngineState *s, int restoring) { reg_t r_temp; // Temporary register StackPtr s_temp; // Temporary stack pointer int16 opparams[4]; // opcode parameters - bool loadFromGMM = ConfMan.hasKey("save_slot") ? true : false; - if (loadFromGMM) { + bool loadFromLauncher = ConfMan.hasKey("save_slot") ? true : false; + if (loadFromLauncher) { if (ConfMan.getInt("save_slot") < 0) - loadFromGMM = false; // already loaded + loadFromLauncher = false; // already loaded } scriptState.restAdjust = s->restAdjust; @@ -1042,18 +1042,18 @@ void run_vm(EngineState *s, int restoring) { //warning("callk %s", kfun.orig_name.c_str()); // TODO: SCI2/SCI2.1+ equivalent, once saving/loading works in SCI2/SCI2.1+ - if (loadFromGMM && opparams[0] == 0x8) { - // A game is being loaded from GMM, and kDisplay is called, all initialization has taken + if (loadFromLauncher && opparams[0] == 0x8) { + // A game is being loaded from the launcher, and kDisplay is called, all initialization has taken // place (i.e. menus have been constructed etc). Therefore, inject a kRestoreGame call - // here, instead of the requested function + // here, instead of the requested function. int saveSlot = ConfMan.getInt("save_slot"); ConfMan.setInt("save_slot", -1); // invalidate slot - loadFromGMM = false; + loadFromLauncher = false; if (saveSlot < 0) error("Requested to load invalid save slot"); // should never happen, really - reg_t restoreArgv[2] = { NULL_REG, make_reg(0, saveSlot) }; // special GMM call (argv[0] is NULL) + reg_t restoreArgv[2] = { NULL_REG, make_reg(0, saveSlot) }; // special call (argv[0] is NULL) kRestoreGame(s, 2, restoreArgv); } else { // Call kernel function |