thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ALL: game state => saved game

Browse source
This commit is contained in:
Ben Castricum 2016-11-29 11:43:57 +01:00
parent 38eb27212d
commit 6f38c1e55d
13 changed files with 23 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

2
common/error.cpp
View file

@ -65,7 +65,7 @@ static String errorToString(ErrorCode errorCode) {
case kEnginePluginNotFound:
return _s("Could not find suitable engine plugin");
case kEnginePluginNotSupportSaves:
return _s("Engine plugin does not support save states");
return _s("Engine plugin does not support saved games");
case kUserCanceled:
return _s("User canceled");

6
engines/agos/saveload.cpp
View file

@ -156,7 +156,7 @@ void AGOSEngine::quickLoadOrSave() {
Subroutine *sub;
success = loadGame(genSaveName(_saveLoadSlot));
if (!success) {
buf = Common::String::format(_("Failed to load game state from file:\n\n%s"), filename.c_str());
buf = Common::String::format(_("Failed to load saved game from file:\n\n%s"), filename.c_str());
} else if (getGameType() == GType_SIMON1 || getGameType() == GType_SIMON2) {
drawIconArray(2, me(), 0, 0);
setBitFlag(97, true);
@ -191,7 +191,7 @@ void AGOSEngine::quickLoadOrSave() {
} else {
success = saveGame(_saveLoadSlot, _saveLoadName);
if (!success)
buf = Common::String::format(_("Failed to save game state to file:\n\n%s"), filename.c_str());
buf = Common::String::format(_("Failed to save game to file:\n\n%s"), filename.c_str());
}
if (!success) {
@ -199,7 +199,7 @@ void AGOSEngine::quickLoadOrSave() {
dialog.runModal();
} else if (_saveLoadType == 1) {
buf = Common::String::format(_("Successfully saved game state in file:\n\n%s"), filename.c_str());
buf = Common::String::format(_("Successfully saved game in file:\n\n%s"), filename.c_str());
GUI::TimedMessageDialog dialog(buf, 1500);
dialog.runModal();

2
engines/dialogs.cpp
View file

@ -231,7 +231,7 @@ void MainMenuDialog::save() {
Common::Error status = _engine->saveGameState(slot, result);
if (status.getCode() != Common::kNoError) {
Common::String failMessage = Common::String::format(_("Gamestate save failed (%s)! "
Common::String failMessage = Common::String::format(_("Failed to save game (%s)! "
"Please consult the README for basic information, and for "
"instructions on how to obtain further assistance."), status.getDesc().c_str());
GUI::MessageDialog dialog(failMessage);

2
engines/engine.cpp
View file

@ -539,7 +539,7 @@ void Engine::openMainMenuDialog() {
if (_saveSlotToLoad >= 0) {
Common::Error status = loadGameState(_saveSlotToLoad);
if (status.getCode() != Common::kNoError) {
Common::String failMessage = Common::String::format(_("Gamestate load failed (%s)! "
Common::String failMessage = Common::String::format(_("Failed to load saved game (%s)! "
"Please consult the README for basic information, and for "
"instructions on how to obtain further assistance."), status.getDesc().c_str());
GUI::MessageDialog dialog(failMessage);

4
engines/gob/inter_geisha.cpp
View file

@ -229,7 +229,7 @@ void Inter_Geisha::oGeisha_readData(OpFuncParams &params) {
if (!_vm->_saveLoad->load(file, dataVar, 0, 0)) {
GUI::MessageDialog dialog(_("Failed to load game state from file."));
GUI::MessageDialog dialog(_("Failed to load saved game from file."));
dialog.runModal();
} else
@ -260,7 +260,7 @@ void Inter_Geisha::oGeisha_writeData(OpFuncParams &params) {
if (!_vm->_saveLoad->save(file, dataVar, size, 0)) {
GUI::MessageDialog dialog(_("Failed to save game state to file."));
GUI::MessageDialog dialog(_("Failed to save game to file."));
dialog.runModal();
} else

2
engines/gob/inter_playtoons.cpp
View file

@ -252,7 +252,7 @@ void Inter_Playtoons::oPlaytoons_readData(OpFuncParams &params) {
WRITE_VAR(1, 1);
if (!_vm->_saveLoad->load(file.c_str(), dataVar, size, offset)) {
GUI::MessageDialog dialog(_("Failed to load game state from file."));
GUI::MessageDialog dialog(_("Failed to load saved game from file."));
dialog.runModal();
} else
WRITE_VAR(1, 0);

4
engines/gob/inter_v2.cpp
View file

@ -1464,7 +1464,7 @@ void Inter_v2::o2_readData(OpFuncParams &params) {
if (!_vm->_saveLoad->load(file, dataVar, size, offset)) {
GUI::MessageDialog dialog(_("Failed to load game state from file."));
GUI::MessageDialog dialog(_("Failed to load saved game from file."));
dialog.runModal();
} else
@ -1534,7 +1534,7 @@ void Inter_v2::o2_writeData(OpFuncParams &params) {
if (!_vm->_saveLoad->save(file, dataVar, size, offset)) {
GUI::MessageDialog dialog(_("Failed to save game state to file."));
GUI::MessageDialog dialog(_("Failed to save game to file."));
dialog.runModal();
} else

2
engines/kyra/saveload.cpp
View file

@ -156,7 +156,7 @@ Common::SeekableReadStream *KyraEngine_v1::openSaveForReading(const char *filena
if (!header.originalSave) {
if (!header.oldHeader) {
if (header.gameID != _flags.gameID && checkID) {
warning("Trying to load game state from other game (save game: %u, running game: %u)", header.gameID, _flags.gameID);
warning("Trying to load saved game from other game (saved game: %u, running game: %u)", header.gameID, _flags.gameID);
delete in;
return 0;
}

2
engines/pegasus/pegasus.cpp
View file

@ -390,7 +390,7 @@ Common::Error PegasusEngine::showSaveDialog() {
}
void PegasusEngine::showSaveFailedDialog(const Common::Error &status) {
Common::String failMessage = Common::String::format(_("Gamestate save failed (%s)! "
Common::String failMessage = Common::String::format(_("Failed to save game (%s)! "
"Please consult the README for basic information, and for "
"instructions on how to obtain further assistance."), status.getDesc().c_str());
GUI::MessageDialog dialog(failMessage);

4
engines/scumm/help.cpp
View file

@ -77,8 +77,8 @@ void ScummHelp::updateStrings(byte gameId, byte version, Common::Platform platfo
ADD_BIND(".", _("Skip line of text"));
ADD_BIND(_("Esc"), _("Skip cutscene"));
ADD_BIND(_("Space"), _("Pause game"));
ADD_BIND(String(_("Ctrl")) + " 0-9", _("Load game state 1-10"));
ADD_BIND(String(_("Alt")) + " 0-9", _("Save game state 1-10"));
ADD_BIND(String(_("Ctrl")) + " 0-9", _("Load saved game 1-10"));
ADD_BIND(String(_("Alt")) + " 0-9", _("Save game 1-10"));
#ifdef MACOSX
ADD_BIND("Cmd q", _("Quit"));
#else

6
engines/scumm/scumm.cpp
View file

@ -2426,14 +2426,14 @@ void ScummEngine::scummLoop_handleSaveLoad() {
if (_saveLoadFlag == 1) {
success = saveState(_saveLoadSlot, _saveTemporaryState, filename);
if (!success)
errMsg = _("Failed to save game state to file:\n\n%s");
errMsg = _("Failed to save game to file:\n\n%s");
if (success && _saveTemporaryState && VAR_GAME_LOADED != 0xFF && _game.version <= 7)
VAR(VAR_GAME_LOADED) = 201;
} else {
success = loadState(_saveLoadSlot, _saveTemporaryState, filename);
if (!success)
errMsg = _("Failed to load game state from file:\n\n%s");
errMsg = _("Failed to load saved game from file:\n\n%s");
if (success && _saveTemporaryState && VAR_GAME_LOADED != 0xFF)
VAR(VAR_GAME_LOADED) = (_game.version == 8) ? 1 : 203;
@ -2444,7 +2444,7 @@ void ScummEngine::scummLoop_handleSaveLoad() {
} else if (_saveLoadFlag == 1 && _saveLoadSlot != 0 && !_saveTemporaryState) {
// Display "Save successful" message, except for auto saves
char buf[256];
snprintf(buf, sizeof(buf), _("Successfully saved game state in file:\n\n%s"), filename.c_str());
snprintf(buf, sizeof(buf), _("Successfully saved game in file:\n\n%s"), filename.c_str());
GUI::TimedMessageDialog dialog(buf, 1500);
runDialog(dialog);

4
engines/tinsel/saveload.cpp
View file

@ -529,7 +529,7 @@ static bool DoRestore() {
delete f;
if (failed) {
GUI::MessageDialog dialog(_("Failed to load game state from file."));
GUI::MessageDialog dialog(_("Failed to load saved game from file."));
dialog.runModal();
}
@ -542,7 +542,7 @@ static void SaveFailure(Common::OutSaveFile *f) {
_vm->getSaveFileMan()->removeSavefile(g_SaveSceneName);
}
g_SaveSceneName = NULL; // Invalidate save name
GUI::MessageDialog dialog(_("Failed to save game state to file."));
GUI::MessageDialog dialog(_("Failed to save game to file."));
dialog.runModal();
}

6
gui/saveload-dialog.cpp
View file

@ -574,7 +574,7 @@ void SaveLoadChooserSimple::updateSelection(bool redraw) {
if (startEditMode) {
_list->startEditMode();
if (_chooseButton->isEnabled() && _list->getSelectedString() == _("Untitled savestate") &&
if (_chooseButton->isEnabled() && _list->getSelectedString() == _("Untitled saved game") &&
_list->getSelectionColor() == ThemeEngine::kFontColorAlternate) {
_list->setEditString("");
_list->setEditColor(ThemeEngine::kFontColorNormal);
@ -657,12 +657,12 @@ void SaveLoadChooserSimple::updateSaveList() {
}
}
// Show "Untitled savestate" for empty/whitespace saved game descriptions
// Show "Untitled saved game" for empty/whitespace saved game descriptions
Common::String description = x->getDescription();
Common::String trimmedDescription = description;
trimmedDescription.trim();
if (trimmedDescription.empty()) {
description = _("Untitled savestate");
description = _("Untitled saved game");
colors.push_back(ThemeEngine::kFontColorAlternate);
} else {
colors.push_back((x->getLocked() ? ThemeEngine::kFontColorAlternate : ThemeEngine::kFontColorNormal));