aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorStrangerke2017-02-19 21:31:43 +0100
committerStrangerke2017-02-19 21:34:19 +0100
commit9f6ffed6ff29c8e8030fd2ce864f4b6cc4a17893 (patch)
treed59c3bb919bbe22ed73e344254b63e9882b36c16 /engines
parent6c4635ac7d236aa6937df8963aa64bebe0fa1f77 (diff)
downloadscummvm-rg350-9f6ffed6ff29c8e8030fd2ce864f4b6cc4a17893.tar.gz
scummvm-rg350-9f6ffed6ff29c8e8030fd2ce864f4b6cc4a17893.tar.bz2
scummvm-rg350-9f6ffed6ff29c8e8030fd2ce864f4b6cc4a17893.zip
CRYO: Rename sync functions
Diffstat (limited to 'engines')
-rw-r--r--engines/cryo/eden.cpp16
-rw-r--r--engines/cryo/eden.h8
2 files changed, 12 insertions, 12 deletions
diff --git a/engines/cryo/eden.cpp b/engines/cryo/eden.cpp
index 5800e8643b..4a051a661a 100644
--- a/engines/cryo/eden.cpp
+++ b/engines/cryo/eden.cpp
@@ -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++) {
diff --git a/engines/cryo/eden.h b/engines/cryo/eden.h
index 90c28e541a..1fd5415163 100644
--- a/engines/cryo/eden.h
+++ b/engines/cryo/eden.h
@@ -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);