[Scummvm-cvs-logs] CVS: scummvm/sky disk.cpp,1.24,1.25 disk.h,1.3,1.4

Oliver Kiehl olki at users.sourceforge.net
Fri May 30 06:47:08 CEST 2003


Update of /cvsroot/scummvm/scummvm/sky
In directory sc8-pr-cvs1:/tmp/cvs-serv5349

Modified Files:
	disk.cpp disk.h 
Log Message:
cleanup


Index: disk.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/disk.cpp,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- disk.cpp	28 May 2003 21:09:52 -0000	1.24
+++ disk.cpp	30 May 2003 13:35:33 -0000	1.25
@@ -64,10 +64,10 @@
 
 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 @@
 
 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 @@
 		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 @@
 
 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 @@
 		return NULL;
 	}
 	uint8 *retPtr = (*fEntry)->data;
-	prefFile *retStr = *fEntry;
+	PrefFile *retStr = *fEntry;
 	*fEntry = (*fEntry)->next;
 	*fSize = retStr->fileSize;
 	delete retStr;
@@ -316,7 +316,7 @@
 		found = false;
 		while (_loadedFilesList[lCnt] && (!found)) {
 			if (_loadedFilesList[lCnt] == (_buildList[bCnt] & 0x7FFFU)) found = true;
-            lCnt++;
+			lCnt++;
 		}
 		if (found) {
 			bCnt++;
@@ -327,7 +327,7 @@
 		targCnt++;
 		_loadedFilesList[targCnt] = 0;
 		SkyState::_itemList[_buildList[bCnt] & 2047] = (void**)loadFile(_buildList[bCnt] & 0x7FFF, NULL);
-        bCnt++;
+		bCnt++;
 	}
 	_buildList[0] = 0;
 }

Index: disk.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/disk.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- disk.h	28 May 2003 20:55:24 -0000	1.3
+++ disk.h	30 May 2003 13:35:34 -0000	1.4
@@ -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 @@
 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);





More information about the Scummvm-git-logs mailing list