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

MORTEVIELLE: More renaming

Browse source
This commit is contained in:
Strangerke 2012-03-22 08:36:59 +01:00
parent c1e8ff3ada
commit 1a9183e0ba
12 changed files with 654 additions and 653 deletions
Download patch file Download diff file Expand all files Collapse all files

38
engines/mortevielle/saveload.cpp
View file

@ -46,25 +46,25 @@ Common::String SavegameManager::generateSaveName(int slotNumber) {
* Handle saving or loading savegame data
*/
void SavegameManager::sync_save(Common::Serializer &sz) {
sz.syncAsSint16LE(g_vm->g_s1._faithScore);
sz.syncAsSint16LE(g_vm->_saveStruct._faithScore);
for (int i = 0; i < 11; ++i)
sz.syncAsByte(g_vm->g_s1._pourc[i]);
sz.syncAsByte(g_vm->_saveStruct._pourc[i]);
for (int i = 0; i < 43; ++i)
sz.syncAsByte(g_vm->g_s1._teauto[i]);
sz.syncAsByte(g_vm->_saveStruct._teauto[i]);
for (int i = 0; i < 31; ++i)
sz.syncAsByte(g_vm->g_s1._sjer[i]);
sz.syncAsByte(g_vm->_saveStruct._sjer[i]);
sz.syncAsSint16LE(g_vm->g_s1._currPlace);
sz.syncAsSint16LE(g_vm->g_s1._atticBallHoleObjectId);
sz.syncAsSint16LE(g_vm->g_s1._atticRodHoleObjectId);
sz.syncAsSint16LE(g_vm->g_s1._cellarObjectId);
sz.syncAsSint16LE(g_vm->g_s1._secretPassageObjectId);
sz.syncAsSint16LE(g_vm->g_s1._wellObjectId);
sz.syncAsSint16LE(g_vm->g_s1._selectedObjectId);
sz.syncAsSint16LE(g_vm->g_s1._purpleRoomObjectId);
sz.syncAsSint16LE(g_vm->g_s1._cryptObjectId);
sz.syncAsByte(g_vm->g_s1._alreadyEnteredManor);
sz.syncAsByte(g_vm->g_s1._fullHour);
sz.syncAsSint16LE(g_vm->_saveStruct._currPlace);
sz.syncAsSint16LE(g_vm->_saveStruct._atticBallHoleObjectId);
sz.syncAsSint16LE(g_vm->_saveStruct._atticRodHoleObjectId);
sz.syncAsSint16LE(g_vm->_saveStruct._cellarObjectId);
sz.syncAsSint16LE(g_vm->_saveStruct._secretPassageObjectId);
sz.syncAsSint16LE(g_vm->_saveStruct._wellObjectId);
sz.syncAsSint16LE(g_vm->_saveStruct._selectedObjectId);
sz.syncAsSint16LE(g_vm->_saveStruct._purpleRoomObjectId);
sz.syncAsSint16LE(g_vm->_saveStruct._cryptObjectId);
sz.syncAsByte(g_vm->_saveStruct._alreadyEnteredManor);
sz.syncAsByte(g_vm->_saveStruct._fullHour);
sz.syncBytes(g_bufcha, 391);
}
@ -106,7 +106,7 @@ void SavegameManager::loadSavegame(int n) {
Common::Serializer sz(stream, NULL);
sync_save(sz);
g_vm->g_s = g_vm->g_s1;
g_vm->_coreVar = g_vm->_saveStruct;
for (int i = 0; i <= 389; ++i)
g_tabdon[i + kAcha] = g_bufcha[i];
@ -142,9 +142,9 @@ Common::Error SavegameManager::saveGame(int n, const Common::String &saveName) {
for (i = 0; i <= 389; ++i)
g_bufcha[i] = g_tabdon[i + kAcha];
g_vm->g_s1 = g_vm->g_s;
if (g_vm->g_s1._currPlace == 26)
g_vm->g_s1._currPlace = 15;
g_vm->_saveStruct = g_vm->_coreVar;
if (g_vm->_saveStruct._currPlace == 26)
g_vm->_saveStruct._currPlace = 15;
Common::String filename = generateSaveName(n);
f = g_system->getSavefileManager()->openForSaving(filename);