libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-03-01 07:46:11 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

CRYO: Rename sync functions

Browse Source
This commit is contained in:
Strangerke 2017-02-19 21:31:43 +01:00
parent 6c4635ac7d
commit 9f6ffed6ff
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
engines/cryo/eden.cpp
View File

@ -6380,8 +6380,8 @@ void EdenGame::saveGame(char *name) {
}
void EdenGame::syncGame(Common::Serializer s) {
saveGlobalPointers(s);
saveGlobalValues(s);
syncGlobalPointers(s);
syncGlobalValues(s);
// _gameIcons
// CHECKME: only from #123 to #133?
@ -6395,7 +6395,7 @@ void EdenGame::syncGame(Common::Serializer s) {
s.syncAsUint16LE(_gameIcons[i]._objectId);
}
saveCitadelRoomPointers(s);
syncCitadelRoomPointers(s);
// _areasTable
for (int i = 0; i < 12; i++) {
@ -6464,7 +6464,7 @@ void EdenGame::syncGame(Common::Serializer s) {
s.syncAsByte(_persons[i]._steps);
}
saveTapePointers(s);
syncTapePointers(s);
// _tapes
for (int i = 0; i < MAX_TAPES; i++) {
@ -6545,7 +6545,7 @@ void EdenGame::loadgame(char *name) {
#define IDXOUT(val, base, typ, idx) if (val) (idx) = ((byte*)val - (byte*)base) / sizeof(typ); else (idx) = NULLPTR;
#define OFSIN(val, base, typ) if ((void*)(val) != NULLPTR) (val) = (typ*)((char*)(val) + (size_t)(base)); else (val) = 0;
void EdenGame::saveGlobalPointers(Common::Serializer s) {
void EdenGame::syncGlobalPointers(Common::Serializer s) {
uint32 dialogIdx, nextDialogIdx, narratorDialogIdx, lastDialogIdx, tapeIdx, nextRoomIconIdx, roomIdx;
uint32 citaAreaFirstRoomIdx, areaIdx, lastAreaIdx, curAreaIdx, characterIdx, roomCharacterIdx;
@ -6596,7 +6596,7 @@ void EdenGame::saveGlobalPointers(Common::Serializer s) {
}
}
void EdenGame::saveGlobalValues(Common::Serializer s) {
void EdenGame::syncGlobalValues(Common::Serializer s) {
s.syncAsByte(_globals->_areaNum);
s.syncAsByte(_globals->_areaVisitCount);
s.syncAsByte(_globals->_menuItemIdLo);
@ -6760,7 +6760,7 @@ void EdenGame::saveGlobalValues(Common::Serializer s) {
s.syncAsByte(_globals->_saveEnd);
}
void EdenGame::saveCitadelRoomPointers(Common::Serializer s) {
void EdenGame::syncCitadelRoomPointers(Common::Serializer s) {
uint32 citadelRoomIdx;
for (int i = 0; i < 12; i++) {
if (s.isSaving())
@ -6771,7 +6771,7 @@ void EdenGame::saveCitadelRoomPointers(Common::Serializer s) {
}
}
void EdenGame::saveTapePointers(Common::Serializer s) {
void EdenGame::syncTapePointers(Common::Serializer s) {
int persoIdx, dialogIdx;
for (int i = 0; i < 16; i++) {

8
engines/cryo/eden.h
View File

@ -467,10 +467,10 @@ private:
void loadrestart();
void loadgame(char *name);
void syncGame(Common::Serializer s);
void saveGlobalPointers(Common::Serializer s);
void saveGlobalValues(Common::Serializer s);
void saveCitadelRoomPointers(Common::Serializer s);
void saveTapePointers(Common::Serializer s);
void syncGlobalPointers(Common::Serializer s);
void syncGlobalValues(Common::Serializer s);
void syncCitadelRoomPointers(Common::Serializer s);
void syncTapePointers(Common::Serializer s);
char testCondition(int16 index);
uint16 operAdd(uint16 v1, uint16 v2);
uint16 operSub(uint16 v1, uint16 v2);