aboutsummaryrefslogtreecommitdiff
path: root/sky/disk.cpp
diff options
context:
space:
mode:
authorRobert Göffringmann2004-12-15 06:48:08 +0000
committerRobert Göffringmann2004-12-15 06:48:08 +0000
commit2308ba8aafcd4d9f4f1ef7c0281177455c8e3e14 (patch)
tree1296b833b4c30432d828a7b87a7bbba8abf54284 /sky/disk.cpp
parent75ac1363b36158bfab3c51a5b9aafec85ea54d4e (diff)
downloadscummvm-rg350-2308ba8aafcd4d9f4f1ef7c0281177455c8e3e14.tar.gz
scummvm-rg350-2308ba8aafcd4d9f4f1ef7c0281177455c8e3e14.tar.bz2
scummvm-rg350-2308ba8aafcd4d9f4f1ef7c0281177455c8e3e14.zip
moved compacts and related static data out of the scummvm.exe into an external file
(available from www.lavosspawn.de/tmp/sky_cpt.zip) svn-id: r16053
Diffstat (limited to 'sky/disk.cpp')
-rw-r--r--sky/disk.cpp23
1 files changed, 11 insertions, 12 deletions
diff --git a/sky/disk.cpp b/sky/disk.cpp
index 104f453653..4e80d74d1f 100644
--- a/sky/disk.cpp
+++ b/sky/disk.cpp
@@ -255,12 +255,12 @@ uint8 *Disk::getFileInfo(uint16 fileNr) {
return 0; //not found
}
-void Disk::fnCacheChip(uint32 list) {
+void Disk::fnCacheChip(uint16 *fList) {
// fnCacheChip is called after fnCacheFast
uint16 cnt = 0;
- while (_buildList[cnt]) cnt++;
- uint16 *fList = (uint16 *)SkyEngine::fetchCompact(list);
+ while (_buildList[cnt])
+ cnt++;
uint16 fCnt = 0;
do {
_buildList[cnt + fCnt] = fList[fCnt] & 0x7FFFU;
@@ -269,15 +269,14 @@ void Disk::fnCacheChip(uint32 list) {
fnCacheFiles();
}
-void Disk::fnCacheFast(uint32 list) {
-
- if (list == 0) return;
- uint8 cnt = 0;
- uint16 *fList = (uint16 *)SkyEngine::fetchCompact(list);
- do {
- _buildList[cnt] = fList[cnt] & 0x7FFFU;
- cnt++;
- } while (fList[cnt-1]);
+void Disk::fnCacheFast(uint16 *fList) {
+ if (fList != NULL) {
+ uint8 cnt = 0;
+ do {
+ _buildList[cnt] = fList[cnt] & 0x7FFFU;
+ cnt++;
+ } while (fList[cnt-1]);
+ }
}
void Disk::fnCacheFiles(void) {