diff options
author | Filippos Karapetis | 2017-02-11 20:42:07 +0200 |
---|---|---|
committer | Filippos Karapetis | 2017-02-11 20:42:07 +0200 |
commit | 01e7b4edcf1ac22e1e3ad8889d42fe3469468b12 (patch) | |
tree | 41a2ccd8d53f4d35c24e215869b8fb067f06c858 /engines/cryo | |
parent | fffe7c786752fdad7098e21bcf2e4a412c9df283 (diff) | |
download | scummvm-rg350-01e7b4edcf1ac22e1e3ad8889d42fe3469468b12.tar.gz scummvm-rg350-01e7b4edcf1ac22e1e3ad8889d42fe3469468b12.tar.bz2 scummvm-rg350-01e7b4edcf1ac22e1e3ad8889d42fe3469468b12.zip |
CRYO: Fix typos in some sizeof() values
Diffstat (limited to 'engines/cryo')
-rw-r--r-- | engines/cryo/eden.cpp | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/engines/cryo/eden.cpp b/engines/cryo/eden.cpp index 4807a942bb..18d8be2ace 100644 --- a/engines/cryo/eden.cpp +++ b/engines/cryo/eden.cpp @@ -4603,7 +4603,7 @@ void EdenGame::loadIconFile(uint16 num, Icon *buffer) { debug("* Loading icon - Resource %d (%s) at 0x%X, %d bytes", num, file->_name.c_str(), offs, size); _bigfile.seek(offs, SEEK_SET); - int count = size / 14; // sizeof(Icon) + int count = size / 18; // sizeof(Icon) for (int i = 0; i < count; i++) { if (_vm->getPlatform() == Common::kPlatformMacintosh) { buffer[i].sx = _bigfile.readSint16BE(); @@ -4638,7 +4638,7 @@ void EdenGame::loadRoomFile(uint16 num, Room *buffer) { debug("* Loading room - Resource %d (%s) at 0x%X, %d bytes", num, file->_name.c_str(), offs, size); _bigfile.seek(offs, SEEK_SET); - int count = size / 11; // sizeof(Room) + int count = size / 14; // sizeof(Room) for (int i = 0; i < count; i++) { buffer[i]._id = _bigfile.readByte(); for (int j = 0; j < 4; j++) @@ -4750,27 +4750,29 @@ void EdenGame::loadpermfiles() { const int kNumActionCursors = 299; const int expectedDataSize = - kNumIcons * 14 + // sizeof(Icon) - kNumRooms * 11 + // sizeof(Room) + kNumIcons * 18 + // sizeof(Icon) + kNumRooms * 14 + // sizeof(Room) kNumFollowers * 16 + // sizeof(Follower) kNumLabyrinthPath + kNumDinoSpeedForCitaLevel + kNumTabletView + kNumPersoRoomBankTable + kNumGotos * 5 + // sizeof(Goto) - kNumObjects * 10 + // sizeof(object_t) + kNumObjects * 12 + // sizeof(object_t) kNumObjectLocations * 2 + kNumPersons * 18 + // sizeof(perso_t) - kNumCitadel * 6 + // sizeof(Citadel) + kNumCitadel * 34 + // sizeof(Citadel) kNumCharacterRects * 8 + kNumCharacters * 5 + kNumAreas * 10 + // (sizeof(Area) - 4) 64 * 2 + 64 * 2 + - kNumActionCursors; + kNumActionCursors + + 12 + + 3 * 6 * 2 * 3 * 2; if (f.open("cryo.dat")) { - const int dataSize = f.size() - 8 - 1; // CRYODATA + version + const int dataSize = f.size() - 8 - 4; // CRYODATA + version char headerId[9]; f.read(headerId, 8); |