diff options
| author | Max Horn | 2002-12-21 12:34:17 +0000 |
|---|---|---|
| committer | Max Horn | 2002-12-21 12:34:17 +0000 |
| commit | 060562c2773cdfc28b78d1c08977070d94673ec2 (patch) | |
| tree | 6b0836fd340d2fdebaddaf82abc28d56b15b89a3 /scumm/resource.cpp | |
| parent | 3b28dcbe3489d7459e58b63212b01118c0b10f9b (diff) | |
| download | scummvm-rg350-060562c2773cdfc28b78d1c08977070d94673ec2.tar.gz scummvm-rg350-060562c2773cdfc28b78d1c08977070d94673ec2.tar.bz2 scummvm-rg350-060562c2773cdfc28b78d1c08977070d94673ec2.zip | |
partial checkin of patch #655594 (handling Y/N questions); cleanup
svn-id: r6042
Diffstat (limited to 'scumm/resource.cpp')
| -rw-r--r-- | scumm/resource.cpp | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/scumm/resource.cpp b/scumm/resource.cpp index 34524a5128..5551d00f0f 100644 --- a/scumm/resource.cpp +++ b/scumm/resource.cpp @@ -54,7 +54,7 @@ void Scumm::openRoom(int room) } /* Either xxx.lfl or monkey.xxx file name */ - while (!_resFilePrefix) { + while (1) { if (_features & GF_SMALL_NAMES) roomlimit = 98; else @@ -64,7 +64,7 @@ void Scumm::openRoom(int room) else room_offs = room ? _roomFileOffsets[room] : 0; - if (room_offs == (int)0xFFFFFFFF) + if (room_offs == -1) break; if (room_offs != 0 && room != 0) { @@ -96,10 +96,7 @@ void Scumm::openRoom(int room) } } else { sprintf(buf, "%.2d.lfl", room); - if (_features & GF_OLD_BUNDLE) - _encbyte = 0xFF; - else - _encbyte = 0; + _encbyte = (_features & GF_USE_KEY) ? 0xFF : 0; } if (openResourceFile(buf)) { |