diff options
| author | Oliver Kiehl | 2003-05-30 13:35:34 +0000 |
|---|---|---|
| committer | Oliver Kiehl | 2003-05-30 13:35:34 +0000 |
| commit | 9c98000f25b391281f5d4ab90ea0d8ce698cf3d9 (patch) | |
| tree | d8cb5ee3448fb5906928ac3fabf6ade1f4f5a1fd /sky | |
| parent | a7c5dbf7aa1573029897f7744192e5326472d8f2 (diff) | |
| download | scummvm-rg350-9c98000f25b391281f5d4ab90ea0d8ce698cf3d9.tar.gz scummvm-rg350-9c98000f25b391281f5d4ab90ea0d8ce698cf3d9.tar.bz2 scummvm-rg350-9c98000f25b391281f5d4ab90ea0d8ce698cf3d9.zip | |
cleanup
svn-id: r8138
Diffstat (limited to 'sky')
| -rw-r--r-- | sky/disk.cpp | 16 | ||||
| -rw-r--r-- | sky/disk.h | 10 |
2 files changed, 13 insertions, 13 deletions
diff --git a/sky/disk.cpp b/sky/disk.cpp index 8f755bb878..a74160b0a5 100644 --- a/sky/disk.cpp +++ b/sky/disk.cpp @@ -64,10 +64,10 @@ SkyDisk::SkyDisk(char *gameDataPath) { SkyDisk::~SkyDisk(void) { - prefFile **fEntry = &_prefRoot; + PrefFile **fEntry = &_prefRoot; while (*fEntry) { free((*fEntry)->data); - prefFile *fTemp = *fEntry; + PrefFile *fTemp = *fEntry; fEntry = &((*fEntry)->next); delete fTemp; } @@ -203,7 +203,7 @@ uint8 *SkyDisk::loadFile(uint16 fileNr, uint8 *dest) { void SkyDisk::prefetchFile(uint16 fileNr) { - prefFile **fEntry = &_prefRoot; + PrefFile **fEntry = &_prefRoot; bool found = false; while (*fEntry) { if ((*fEntry)->fileNr == fileNr) found = true; @@ -214,7 +214,7 @@ void SkyDisk::prefetchFile(uint16 fileNr) { return ; } uint8 *temp = loadFile(fileNr, NULL); - *fEntry = new prefFile; + *fEntry = new PrefFile; (*fEntry)->data = temp; (*fEntry)->fileSize = _lastLoadedFileSize; (*fEntry)->fileNr = fileNr; @@ -223,7 +223,7 @@ void SkyDisk::prefetchFile(uint16 fileNr) { uint8 *SkyDisk::givePrefetched(uint16 fileNr, uint32 *fSize) { - prefFile **fEntry = &_prefRoot; + PrefFile **fEntry = &_prefRoot; bool found = false; while ((*fEntry) && (!found)) { if ((*fEntry)->fileNr == fileNr) found = true; @@ -234,7 +234,7 @@ uint8 *SkyDisk::givePrefetched(uint16 fileNr, uint32 *fSize) { return NULL; } uint8 *retPtr = (*fEntry)->data; - prefFile *retStr = *fEntry; + PrefFile *retStr = *fEntry; *fEntry = (*fEntry)->next; *fSize = retStr->fileSize; delete retStr; @@ -316,7 +316,7 @@ void SkyDisk::fnCacheFiles(void) { found = false; while (_loadedFilesList[lCnt] && (!found)) { if (_loadedFilesList[lCnt] == (_buildList[bCnt] & 0x7FFFU)) found = true; - lCnt++; + lCnt++; } if (found) { bCnt++; @@ -327,7 +327,7 @@ void SkyDisk::fnCacheFiles(void) { targCnt++; _loadedFilesList[targCnt] = 0; SkyState::_itemList[_buildList[bCnt] & 2047] = (void**)loadFile(_buildList[bCnt] & 0x7FFF, NULL); - bCnt++; + bCnt++; } _buildList[0] = 0; } diff --git a/sky/disk.h b/sky/disk.h index 920ed51676..dcde7697ff 100644 --- a/sky/disk.h +++ b/sky/disk.h @@ -26,12 +26,12 @@ #define MAX_FILES_IN_LIST 60 -typedef struct __prefFile { +struct PrefFile { uint8 *data; uint16 fileNr; uint32 fileSize; - struct __prefFile *next; -} prefFile; + PrefFile *next; +}; class SkyDisk { public: @@ -53,8 +53,8 @@ public: protected: - prefFile *_prefRoot; - uint8 *givePrefetched(uint16 fileNr, uint32 *fSize); + PrefFile *_prefRoot; + uint8 *givePrefetched(uint16 fileNr, uint32 *fSize); uint8 *getFileInfo(uint16 fileNr); void dumpFile(uint16 fileNr); |