[Scummvm-cvs-logs] CVS: scummvm/sky disk.cpp,1.27,1.28
Robert G?ffringmann
lavosspawn at users.sourceforge.net
Thu Jun 5 12:50:08 CEST 2003
Update of /cvsroot/scummvm/scummvm/sky
In directory sc8-pr-cvs1:/tmp/cvs-serv4558/sky
Modified Files:
disk.cpp
Log Message:
fixed caching routines
Index: disk.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/disk.cpp,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- disk.cpp 2 Jun 2003 06:42:41 -0000 1.27
+++ disk.cpp 5 Jun 2003 19:45:27 -0000 1.28
@@ -277,7 +277,7 @@
uint16 *fList = (uint16*)SkyState::fetchCompact(list);
uint16 fCnt = 0;
do {
- _buildList[cnt + fCnt] = fList[fCnt];
+ _buildList[cnt + fCnt] = fList[fCnt] & 0x7FFFU;
fCnt++;
} while (fList[fCnt-1]);
fnCacheFiles();
@@ -311,8 +311,8 @@
_loadedFilesList[targCnt] = _loadedFilesList[lCnt];
targCnt++;
} else {
- free(SkyState::_itemList[_loadedFilesList[lCnt]]);
- SkyState::_itemList[_loadedFilesList[lCnt]] = NULL;
+ free(SkyState::_itemList[_loadedFilesList[lCnt] & 2047]);
+ SkyState::_itemList[_loadedFilesList[lCnt] & 2047] = NULL;
}
lCnt++;
}
@@ -335,7 +335,7 @@
continue;
}
// ok, we really have to load the file.
- _loadedFilesList[targCnt] = _buildList[bCnt];
+ _loadedFilesList[targCnt] = _buildList[bCnt] & 0x7FFFU;
targCnt++;
_loadedFilesList[targCnt] = 0;
SkyState::_itemList[_buildList[bCnt] & 2047] = (void**)loadFile(_buildList[bCnt] & 0x7FFF, NULL);
More information about the Scummvm-git-logs
mailing list