diff options
| author | Filippos Karapetis | 2017-02-10 10:08:04 +0200 |
|---|---|---|
| committer | Filippos Karapetis | 2017-02-10 10:08:04 +0200 |
| commit | 79e774b80618b240b4d90bd7bf37b7141e2c6120 (patch) | |
| tree | b709dcb8dceddfddb77efb65e773ccbd71bc47cb /engines | |
| parent | 3e4710bb209d1647d0cbc6fc6bffc7938a983303 (diff) | |
| download | scummvm-rg350-79e774b80618b240b4d90bd7bf37b7141e2c6120.tar.gz scummvm-rg350-79e774b80618b240b4d90bd7bf37b7141e2c6120.tar.bz2 scummvm-rg350-79e774b80618b240b4d90bd7bf37b7141e2c6120.zip | |
Revert "CRYO: Add handling for the cryo.dat aux data file"
This reverts commit 01e072fbbc1baaf8aaa48aba0842bf8977510b93.
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/cryo/eden.cpp | 20 |
1 files changed, 3 insertions, 17 deletions
diff --git a/engines/cryo/eden.cpp b/engines/cryo/eden.cpp index 4ff18bf307..b8e191c50b 100644 --- a/engines/cryo/eden.cpp +++ b/engines/cryo/eden.cpp @@ -48,8 +48,6 @@ namespace Cryo { -#define CRYO_DAT_VER 1 // 1 byte - int16 _torchTick = 0; int16 _glowIndex = 0; int16 _torchCurIndex = 0; @@ -4735,23 +4733,11 @@ void EdenGame::loadpermfiles() { // Since PC version stores hotspots and rooms info in the executable, load them from premade resource file Common::File f; - if (f.open("cryo.dat")) { + if (f.open("led.dat")) { const int kNumIcons = 136; const int kNumRooms = 424; - const int dataSize = f.size() - 8 - 1; // CRYODATA + version - char headerId[9]; - - f.read(headerId, 8); - headerId[8] = '\0'; - if (strcmp(headerId, "CRYODATA")) - error("Invalid aux data file"); - - if (f.readByte() != CRYO_DAT_VER) - error("Incorrect aux data version"); - - if (dataSize != kNumIcons * sizeof(Icon) + kNumRooms * sizeof(Room)) - error("Mismatching data in aux data file"); - + if (f.size() != kNumIcons * sizeof(Icon) + kNumRooms * sizeof(Room)) + error("Mismatching aux data"); for (int i = 0; i < kNumIcons; i++) { _gameIcons[i].sx = f.readSint16LE(); _gameIcons[i].sy = f.readSint16LE(); |