diff options
| author | Johannes Schickel | 2010-10-13 03:57:44 +0000 |
|---|---|---|
| committer | Johannes Schickel | 2010-10-13 03:57:44 +0000 |
| commit | 75e8452b6e6a2bf4fb2f588aa00b428a60d873b5 (patch) | |
| tree | f29541d55309487a94bd1d38e8b53bb3dde9aec6 /engines/mohawk/riven_saveload.cpp | |
| parent | 48ee83b88957dab86bc763e9ef21a70179fa8679 (diff) | |
| parent | e9f50882ea5b6beeefa994040be9d3bab6a1f107 (diff) | |
| download | scummvm-rg350-75e8452b6e6a2bf4fb2f588aa00b428a60d873b5.tar.gz scummvm-rg350-75e8452b6e6a2bf4fb2f588aa00b428a60d873b5.tar.bz2 scummvm-rg350-75e8452b6e6a2bf4fb2f588aa00b428a60d873b5.zip | |
OPENGL: Merged from trunk, from rev 52105 to 53396.
This includes an rather hacky attempt to merge all the recent gp2x backend
changes into the branch. I suppose the gp2x backend and probably all new
backends, i.e. gph, dingux etc., might not compile anymore.
Since I have no way of testing those it would be nice if porters could look
into getting those up to speed in this branch.
svn-id: r53399
Diffstat (limited to 'engines/mohawk/riven_saveload.cpp')
| -rw-r--r-- | engines/mohawk/riven_saveload.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/engines/mohawk/riven_saveload.cpp b/engines/mohawk/riven_saveload.cpp index d73b4ec0dc..c63a3f98fb 100644 --- a/engines/mohawk/riven_saveload.cpp +++ b/engines/mohawk/riven_saveload.cpp @@ -110,7 +110,7 @@ bool RivenSaveLoad::loadGame(Common::String filename) { delete vers; if ((saveGameVersion == kCDSaveGameVersion && (_vm->getFeatures() & GF_DVD)) || (saveGameVersion == kDVDSaveGameVersion && !(_vm->getFeatures() & GF_DVD))) { - warning("Incompatible saved game versions. No support for this yet."); + warning("Incompatible saved game versions. No support for this yet"); delete mhk; return false; } @@ -161,7 +161,7 @@ bool RivenSaveLoad::loadGame(Common::String filename) { if (name == "dropLeftStart" || name == "dropRightStart") continue; - uint32 *var = _vm->matchVarToString(name); + uint32 *var = _vm->getVar(name); *var = rawVariables[i]; @@ -272,8 +272,8 @@ bool RivenSaveLoad::saveGame(Common::String filename) { filename += ".rvn"; // Convert class variables to variable numbers - *_vm->matchVarToString("currentstackid") = mapNewStackIDToOld(_vm->getCurStack()); - *_vm->matchVarToString("currentcardid") = _vm->getCurCard(); + *_vm->getVar("currentstackid") = mapNewStackIDToOld(_vm->getCurStack()); + *_vm->getVar("currentcardid") = _vm->getCurCard(); Common::OutSaveFile *saveFile = _saveFileMan->openForSaving(filename); if (!saveFile) |