[Scummvm-cvs-logs] SF.net SVN: scummvm:[53912] scummvm/trunk/engines/kyra
lordhoto at users.sourceforge.net
lordhoto at users.sourceforge.net
Fri Oct 29 01:57:25 CEST 2010
Revision: 53912
http://scummvm.svn.sourceforge.net/scummvm/?rev=53912&view=rev
Author: lordhoto
Date: 2010-10-28 23:57:24 +0000 (Thu, 28 Oct 2010)
Log Message:
-----------
KYRA: Rename KyraEngine::saveGameState to KyraEngine::saveGameStateIntern.
This is to avoid name similarity between KyraEngine::saveGameState(Intern)
and Engine::saveGameState.
Modified Paths:
--------------
scummvm/trunk/engines/kyra/gui_hof.cpp
scummvm/trunk/engines/kyra/gui_lok.cpp
scummvm/trunk/engines/kyra/gui_lol.cpp
scummvm/trunk/engines/kyra/gui_mr.cpp
scummvm/trunk/engines/kyra/gui_v2.cpp
scummvm/trunk/engines/kyra/kyra_hof.cpp
scummvm/trunk/engines/kyra/kyra_hof.h
scummvm/trunk/engines/kyra/kyra_lok.cpp
scummvm/trunk/engines/kyra/kyra_lok.h
scummvm/trunk/engines/kyra/kyra_mr.cpp
scummvm/trunk/engines/kyra/kyra_mr.h
scummvm/trunk/engines/kyra/kyra_v1.cpp
scummvm/trunk/engines/kyra/kyra_v1.h
scummvm/trunk/engines/kyra/lol.h
scummvm/trunk/engines/kyra/saveload.cpp
scummvm/trunk/engines/kyra/saveload_hof.cpp
scummvm/trunk/engines/kyra/saveload_lok.cpp
scummvm/trunk/engines/kyra/saveload_lol.cpp
scummvm/trunk/engines/kyra/saveload_mr.cpp
scummvm/trunk/engines/kyra/script_mr.cpp
scummvm/trunk/engines/kyra/timer_mr.cpp
Modified: scummvm/trunk/engines/kyra/gui_hof.cpp
===================================================================
--- scummvm/trunk/engines/kyra/gui_hof.cpp 2010-10-28 23:56:36 UTC (rev 53911)
+++ scummvm/trunk/engines/kyra/gui_hof.cpp 2010-10-28 23:57:24 UTC (rev 53912)
@@ -998,7 +998,7 @@
Graphics::Surface thumb;
createScreenThumbnail(thumb);
- _vm->saveGameState(999, "Autosave", &thumb);
+ _vm->saveGameStateIntern(999, "Autosave", &thumb);
thumb.free();
_vm->_lastAutosave = _vm->_system->getMillis();
Modified: scummvm/trunk/engines/kyra/gui_lok.cpp
===================================================================
--- scummvm/trunk/engines/kyra/gui_lok.cpp 2010-10-28 23:56:36 UTC (rev 53911)
+++ scummvm/trunk/engines/kyra/gui_lok.cpp 2010-10-28 23:57:24 UTC (rev 53912)
@@ -778,7 +778,7 @@
Graphics::Surface thumb;
createScreenThumbnail(thumb);
- _vm->saveGameState(_vm->_gameToLoad, _savegameName, &thumb);
+ _vm->saveGameStateIntern(_vm->_gameToLoad, _savegameName, &thumb);
thumb.free();
}
}
Modified: scummvm/trunk/engines/kyra/gui_lol.cpp
===================================================================
--- scummvm/trunk/engines/kyra/gui_lol.cpp 2010-10-28 23:56:36 UTC (rev 53911)
+++ scummvm/trunk/engines/kyra/gui_lol.cpp 2010-10-28 23:57:24 UTC (rev 53912)
@@ -2906,7 +2906,7 @@
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;
Modified: scummvm/trunk/engines/kyra/gui_mr.cpp
===================================================================
--- scummvm/trunk/engines/kyra/gui_mr.cpp 2010-10-28 23:56:36 UTC (rev 53911)
+++ scummvm/trunk/engines/kyra/gui_mr.cpp 2010-10-28 23:57:24 UTC (rev 53912)
@@ -1380,7 +1380,7 @@
Graphics::Surface thumb;
createScreenThumbnail(thumb);
- _vm->saveGameState(999, "Autosave", &thumb);
+ _vm->saveGameStateIntern(999, "Autosave", &thumb);
thumb.free();
_vm->_lastAutosave = _vm->_system->getMillis();
Modified: scummvm/trunk/engines/kyra/gui_v2.cpp
===================================================================
--- scummvm/trunk/engines/kyra/gui_v2.cpp 2010-10-28 23:56:36 UTC (rev 53911)
+++ scummvm/trunk/engines/kyra/gui_v2.cpp 2010-10-28 23:57:24 UTC (rev 53912)
@@ -625,7 +625,7 @@
Graphics::Surface thumb;
createScreenThumbnail(thumb);
Util::convertDOSToISO(_saveDescription);
- _vm->saveGameState(_saveSlot, _saveDescription, &thumb);
+ _vm->saveGameStateIntern(_saveSlot, _saveDescription, &thumb);
thumb.free();
_displayMenu = false;
Modified: scummvm/trunk/engines/kyra/kyra_hof.cpp
===================================================================
--- scummvm/trunk/engines/kyra/kyra_hof.cpp 2010-10-28 23:56:36 UTC (rev 53911)
+++ scummvm/trunk/engines/kyra/kyra_hof.cpp 2010-10-28 23:57:24 UTC (rev 53912)
@@ -441,7 +441,7 @@
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);
}
Modified: scummvm/trunk/engines/kyra/kyra_hof.h
===================================================================
--- scummvm/trunk/engines/kyra/kyra_hof.h 2010-10-28 23:56:36 UTC (rev 53911)
+++ scummvm/trunk/engines/kyra/kyra_hof.h 2010-10-28 23:57:24 UTC (rev 53912)
@@ -915,7 +915,7 @@
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);
};
Modified: scummvm/trunk/engines/kyra/kyra_lok.cpp
===================================================================
--- scummvm/trunk/engines/kyra/kyra_lok.cpp 2010-10-28 23:56:36 UTC (rev 53911)
+++ scummvm/trunk/engines/kyra/kyra_lok.cpp 2010-10-28 23:57:24 UTC (rev 53912)
@@ -420,7 +420,7 @@
_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);
Modified: scummvm/trunk/engines/kyra/kyra_lok.h
===================================================================
--- scummvm/trunk/engines/kyra/kyra_lok.h 2010-10-28 23:56:36 UTC (rev 53911)
+++ scummvm/trunk/engines/kyra/kyra_lok.h 2010-10-28 23:57:24 UTC (rev 53912)
@@ -212,7 +212,7 @@
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
Modified: scummvm/trunk/engines/kyra/kyra_mr.cpp
===================================================================
--- scummvm/trunk/engines/kyra/kyra_mr.cpp 2010-10-28 23:56:36 UTC (rev 53911)
+++ scummvm/trunk/engines/kyra/kyra_mr.cpp 2010-10-28 23:57:24 UTC (rev 53912)
@@ -653,7 +653,7 @@
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
Modified: scummvm/trunk/engines/kyra/kyra_mr.h
===================================================================
--- scummvm/trunk/engines/kyra/kyra_mr.h 2010-10-28 23:56:36 UTC (rev 53911)
+++ scummvm/trunk/engines/kyra/kyra_mr.h 2010-10-28 23:57:24 UTC (rev 53912)
@@ -585,7 +585,7 @@
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
Modified: scummvm/trunk/engines/kyra/kyra_v1.cpp
===================================================================
--- scummvm/trunk/engines/kyra/kyra_v1.cpp 2010-10-28 23:56:36 UTC (rev 53911)
+++ scummvm/trunk/engines/kyra/kyra_v1.cpp 2010-10-28 23:57:24 UTC (rev 53912)
@@ -275,7 +275,7 @@
} 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) {
Modified: scummvm/trunk/engines/kyra/kyra_v1.h
===================================================================
--- scummvm/trunk/engines/kyra/kyra_v1.h 2010-10-28 23:56:36 UTC (rev 53911)
+++ scummvm/trunk/engines/kyra/kyra_v1.h 2010-10-28 23:57:24 UTC (rev 53912)
@@ -415,8 +415,8 @@
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;
Modified: scummvm/trunk/engines/kyra/lol.h
===================================================================
--- scummvm/trunk/engines/kyra/lol.h 2010-10-28 23:56:36 UTC (rev 53911)
+++ scummvm/trunk/engines/kyra/lol.h 2010-10-28 23:57:24 UTC (rev 53912)
@@ -1488,7 +1488,7 @@
// 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;
Modified: scummvm/trunk/engines/kyra/saveload.cpp
===================================================================
--- scummvm/trunk/engines/kyra/saveload.cpp 2010-10-28 23:56:36 UTC (rev 53911)
+++ scummvm/trunk/engines/kyra/saveload.cpp 2010-10-28 23:57:24 UTC (rev 53912)
@@ -250,7 +250,7 @@
void KyraEngine_v1::checkAutosave() {
if (shouldPerformAutoSave(_lastAutosave)) {
- saveGameState(999, "Autosave", 0);
+ saveGameStateIntern(999, "Autosave", 0);
_lastAutosave = _system->getMillis();
}
}
Modified: scummvm/trunk/engines/kyra/saveload_hof.cpp
===================================================================
--- scummvm/trunk/engines/kyra/saveload_hof.cpp 2010-10-28 23:56:36 UTC (rev 53911)
+++ scummvm/trunk/engines/kyra/saveload_hof.cpp 2010-10-28 23:57:24 UTC (rev 53912)
@@ -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);
Modified: scummvm/trunk/engines/kyra/saveload_lok.cpp
===================================================================
--- scummvm/trunk/engines/kyra/saveload_lok.cpp 2010-10-28 23:56:36 UTC (rev 53911)
+++ scummvm/trunk/engines/kyra/saveload_lok.cpp 2010-10-28 23:57:24 UTC (rev 53912)
@@ -241,7 +241,7 @@
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())
Modified: scummvm/trunk/engines/kyra/saveload_lol.cpp
===================================================================
--- scummvm/trunk/engines/kyra/saveload_lol.cpp 2010-10-28 23:56:36 UTC (rev 53911)
+++ scummvm/trunk/engines/kyra/saveload_lol.cpp 2010-10-28 23:57:24 UTC (rev 53912)
@@ -274,7 +274,7 @@
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);
Modified: scummvm/trunk/engines/kyra/saveload_mr.cpp
===================================================================
--- scummvm/trunk/engines/kyra/saveload_mr.cpp 2010-10-28 23:56:36 UTC (rev 53911)
+++ scummvm/trunk/engines/kyra/saveload_mr.cpp 2010-10-28 23:57:24 UTC (rev 53912)
@@ -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);
Modified: scummvm/trunk/engines/kyra/script_mr.cpp
===================================================================
--- scummvm/trunk/engines/kyra/script_mr.cpp 2010-10-28 23:56:36 UTC (rev 53911)
+++ scummvm/trunk/engines/kyra/script_mr.cpp 2010-10-28 23:57:24 UTC (rev 53912)
@@ -293,7 +293,7 @@
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;
}
Modified: scummvm/trunk/engines/kyra/timer_mr.cpp
===================================================================
--- scummvm/trunk/engines/kyra/timer_mr.cpp 2010-10-28 23:56:36 UTC (rev 53911)
+++ scummvm/trunk/engines/kyra/timer_mr.cpp 2010-10-28 23:57:24 UTC (rev 53912)
@@ -60,7 +60,7 @@
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);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list