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

KYRA: Rename KyraEngine::saveGameState to KyraEngine::saveGameStateIntern.

Browse source 
This is to avoid name similarity between KyraEngine::saveGameState(Intern)
and Engine::saveGameState.

svn-id: r53912
This commit is contained in:
Johannes Schickel 2010-10-28 23:57:24 +00:00
parent 607920c869
commit 32338876f8
21 changed files with 22 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

2
engines/kyra/gui_hof.cpp
View file

@ -998,7 +998,7 @@ int GUI_HoF::gameOptionsTalkie(Button *caller) {
Graphics::Surface thumb;
createScreenThumbnail(thumb);
_vm->saveGameState(999, "Autosave", &thumb);
_vm->saveGameStateIntern(999, "Autosave", &thumb);
thumb.free();
_vm->_lastAutosave = _vm->_system->getMillis();

2
engines/kyra/gui_lok.cpp
View file

@ -778,7 +778,7 @@ int GUI_LoK::saveGame(Button *button) {
Graphics::Surface thumb;
createScreenThumbnail(thumb);
_vm->saveGameState(_vm->_gameToLoad, _savegameName, &thumb);
_vm->saveGameStateIntern(_vm->_gameToLoad, _savegameName, &thumb);
thumb.free();
}
}

2
engines/kyra/gui_lol.cpp
View file

@ -2906,7 +2906,7 @@ int GUI_LoL::clickedSavenameMenu(Button *button) {
int slot = _menuResult == -2 ? getNextSavegameSlot() : _menuResult - 1;
Graphics::Surface thumb;
createScreenThumbnail(thumb);
_vm->saveGameState(slot, _saveDescription, &thumb);
_vm->saveGameStateIntern(slot, _saveDescription, &thumb);
thumb.free();
_displayMenu = false;

2
engines/kyra/gui_mr.cpp
View file

@ -1380,7 +1380,7 @@ int GUI_MR::gameOptions(Button *caller) {
Graphics::Surface thumb;
createScreenThumbnail(thumb);
_vm->saveGameState(999, "Autosave", &thumb);
_vm->saveGameStateIntern(999, "Autosave", &thumb);
thumb.free();
_vm->_lastAutosave = _vm->_system->getMillis();

2
engines/kyra/gui_v2.cpp
View file

@ -625,7 +625,7 @@ int GUI_v2::saveMenu(Button *caller) {
Graphics::Surface thumb;
createScreenThumbnail(thumb);
Util::convertDOSToISO(_saveDescription);
_vm->saveGameState(_saveSlot, _saveDescription, &thumb);
_vm->saveGameStateIntern(_saveSlot, _saveDescription, &thumb);
thumb.free();
_displayMenu = false;

2
engines/kyra/kyra_hof.cpp
View file

@ -441,7 +441,7 @@ void KyraEngine_HoF::startup() {
if (_gameToLoad == -1) {
snd_playWanderScoreViaMap(52, 1);
enterNewScene(_mainCharacter.sceneId, _mainCharacter.facing, 0, 0, 1);
saveGameState(0, "New Game", 0);
saveGameStateIntern(0, "New Game", 0);
} else {
loadGameStateCheck(_gameToLoad);
}

2
engines/kyra/kyra_hof.h
View file

@ -915,7 +915,7 @@ protected:
int _dbgPass;
// save/load specific
Common::Error saveGameState(int slot, const char *saveName, const Graphics::Surface *thumbnail);
Common::Error saveGameStateIntern(int slot, const char *saveName, const Graphics::Surface *thumbnail);
Common::Error loadGameState(int slot);
};

2
engines/kyra/kyra_lok.cpp
View file

@ -420,7 +420,7 @@ void KyraEngine_LoK::startup() {
_gui->buttonMenuCallback(0);
_menuDirectlyToLoad = false;
} else if (!shouldQuit()) {
saveGameState(0, "New game", 0);
saveGameStateIntern(0, "New game", 0);
}
} else {
_screen->setFont(_flags.lang == Common::JA_JPN ? Screen::FID_SJIS_FNT : Screen::FID_8_FNT);

2
engines/kyra/kyra_lok.h
View file

@ -212,7 +212,7 @@ public:
protected:
int32 _speechPlayTime;
Common::Error saveGameState(int slot, const char *saveName, const Graphics::Surface *thumbnail);
Common::Error saveGameStateIntern(int slot, const char *saveName, const Graphics::Surface *thumbnail);
Common::Error loadGameState(int slot);
protected:
// input

2
engines/kyra/kyra_mr.cpp
View file

@ -653,7 +653,7 @@ void KyraEngine_MR::startup() {
assert(_invWsa);
_invWsa->open("MOODOMTR.WSA", 1, 0);
_invWsaFrame = 6;
saveGameState(0, "New Game", 0);
saveGameStateIntern(0, "New Game", 0);
if (_gameToLoad == -1)
enterNewScene(_mainCharacter.sceneId, _mainCharacter.facing, 0, 0, 1);
else

2
engines/kyra/kyra_mr.h
View file

@ -585,7 +585,7 @@ private:
int albumClose(Button *caller);
// save/load
Common::Error saveGameState(int slot, const char *saveName, const Graphics::Surface *thumbnail);
Common::Error saveGameStateIntern(int slot, const char *saveName, const Graphics::Surface *thumbnail);
Common::Error loadGameState(int slot);
// opcodes

2
engines/kyra/kyra_v1.cpp
View file

@ -275,7 +275,7 @@ int KyraEngine_v1::checkInput(Button *buttonList, bool mainLoop, int eventFlag)
} else {
char savegameName[14];
sprintf(savegameName, "Quicksave %d", event.kbd.keycode - Common::KEYCODE_0);
saveGameState(saveLoadSlot, savegameName, 0);
saveGameStateIntern(saveLoadSlot, savegameName, 0);
}
} else if (event.kbd.hasFlags(Common::KBD_CTRL)) {
if (event.kbd.keycode == Common::KEYCODE_d) {

4
engines/kyra/kyra_v1.h
View file

@ -415,8 +415,8 @@ protected:
void loadGameStateCheck(int slot);
virtual Common::Error loadGameState(int slot) = 0;
Common::Error saveGameState(int slot, const char *saveName) { return saveGameState(slot, saveName, 0); }
virtual Common::Error saveGameState(int slot, const char *saveName, const Graphics::Surface *thumbnail) = 0;
Common::Error saveGameState(int slot, const char *saveName) { return saveGameStateIntern(slot, saveName, 0); }
virtual Common::Error saveGameStateIntern(int slot, const char *saveName, const Graphics::Surface *thumbnail) = 0;
Common::SeekableReadStream *openSaveForReading(const char *filename, SaveHeader &header);
Common::WriteStream *openSaveForWriting(const char *filename, const char *saveName, const Graphics::Surface *thumbnail) const;

2
engines/kyra/lol.h
View file

@ -1488,7 +1488,7 @@ private:
// save
Common::Error loadGameState(int slot);
Common::Error saveGameState(int slot, const char *saveName, const Graphics::Surface *thumbnail);
Common::Error saveGameStateIntern(int slot, const char *saveName, const Graphics::Surface *thumbnail);
Graphics::Surface *generateSaveThumbnail() const;

2
engines/kyra/saveload.cpp
View file

@ -250,7 +250,7 @@ bool KyraEngine_v1::saveFileLoadable(int slot) {
void KyraEngine_v1::checkAutosave() {
if (shouldPerformAutoSave(_lastAutosave)) {
saveGameState(999, "Autosave", 0);
saveGameStateIntern(999, "Autosave", 0);
_lastAutosave = _system->getMillis();
}
}

2
engines/kyra/saveload_hof.cpp
View file

@ -35,7 +35,7 @@
namespace Kyra {
Common::Error KyraEngine_HoF::saveGameState(int slot, const char *saveName, const Graphics::Surface *thumb) {
Common::Error KyraEngine_HoF::saveGameStateIntern(int slot, const char *saveName, const Graphics::Surface *thumb) {
const char *fileName = getSavegameFilename(slot);
Common::OutSaveFile *out = openSaveForWriting(fileName, saveName, thumb);

2
engines/kyra/saveload_lok.cpp
View file

@ -241,7 +241,7 @@ Common::Error KyraEngine_LoK::loadGameState(int slot) {
return Common::kNoError;
}
Common::Error KyraEngine_LoK::saveGameState(int slot, const char *saveName, const Graphics::Surface *thumb) {
Common::Error KyraEngine_LoK::saveGameStateIntern(int slot, const char *saveName, const Graphics::Surface *thumb) {
const char *fileName = getSavegameFilename(slot);
if (shouldQuit())

2
engines/kyra/saveload_lol.cpp
View file

@ -274,7 +274,7 @@ Common::Error LoLEngine::loadGameState(int slot) {
return Common::kNoError;
}
Common::Error LoLEngine::saveGameState(int slot, const char *saveName, const Graphics::Surface *thumbnail) {
Common::Error LoLEngine::saveGameStateIntern(int slot, const char *saveName, const Graphics::Surface *thumbnail) {
const char *fileName = getSavegameFilename(slot);
Common::OutSaveFile *out = openSaveForWriting(fileName, saveName, thumbnail);

2
engines/kyra/saveload_mr.cpp
View file

@ -32,7 +32,7 @@
namespace Kyra {
Common::Error KyraEngine_MR::saveGameState(int slot, const char *saveName, const Graphics::Surface *thumb) {
Common::Error KyraEngine_MR::saveGameStateIntern(int slot, const char *saveName, const Graphics::Surface *thumb) {
const char *fileName = getSavegameFilename(slot);
Common::OutSaveFile *out = openSaveForWriting(fileName, saveName, thumb);

2
engines/kyra/script_mr.cpp
View file

@ -293,7 +293,7 @@ int KyraEngine_MR::o3_updateScore(EMCState *script) {
int KyraEngine_MR::o3_makeSecondChanceSave(EMCState *script) {
debugC(3, kDebugLevelScriptFuncs, "KyraEngine_MR::o3_makeSecondChanceSave(%p) ()", (const void *)script);
saveGameState(999, "Autosave", 0);
saveGameStateIntern(999, "Autosave", 0);
return 0;
}

2
engines/kyra/timer_mr.cpp
View file

@ -60,7 +60,7 @@ void KyraEngine_MR::timerRunSceneScript7(int arg) {
void KyraEngine_MR::timerFleaDeath(int arg) {
_timer->setCountdown(4, 5400);
saveGameState(999, "Autosave", 0);
saveGameStateIntern(999, "Autosave", 0);
_screen->hideMouse();
_timer->disable(4);
runAnimationScript("FLEADTH1.EMC", 0, 0, 1, 1);