[Scummvm-cvs-logs] SF.net SVN: scummvm:[41709] scummvm/trunk/engines/cruise/volume.cpp

[dreammaster at users.sourceforge.net]

Revision: 41709
          http://scummvm.svn.sourceforge.net/scummvm/?rev=41709&view=rev
Author:   dreammaster
Date:     2009-06-20 12:02:08 +0000 (Sat, 20 Jun 2009)

Log Message:
-----------
Changed many file reads and manual conversions from endian format to instead use file readSint16BE/readSint32BE calls

Modified Paths:
--------------
    scummvm/trunk/engines/cruise/volume.cpp

Modified: scummvm/trunk/engines/cruise/volume.cpp
===================================================================
--- scummvm/trunk/engines/cruise/volume.cpp	2009-06-20 11:53:31 UTC (rev 41708)
+++ scummvm/trunk/engines/cruise/volume.cpp	2009-06-20 12:02:08 UTC (rev 41709)
@@ -107,12 +107,9 @@
 
 	changeCursor(CURSOR_DISK);
 
-	currentVolumeFile.read(&volumeNumberOfEntry, 2);
-	currentVolumeFile.read(&volumeSizeOfEntry, 2);
+	volumeNumberOfEntry = currentVolumeFile.readSint16BE();
+	volumeSizeOfEntry = currentVolumeFile.readSint16BE();
 
-	bigEndianShortToNative(&volumeNumberOfEntry);
-	bigEndianShortToNative(&volumeSizeOfEntry);
-
 	volumeNumEntry = volumeNumberOfEntry;
 
 	assert(volumeSizeOfEntry == 14 + 4 + 4 + 4 + 4);
@@ -129,18 +126,12 @@
 
 	for (i = 0; i < volumeNumEntry; i++) {
 		currentVolumeFile.read(&volumePtrToFileDescriptor[i].name, 14);
-		currentVolumeFile.read(&volumePtrToFileDescriptor[i].offset, 4);
-		currentVolumeFile.read(&volumePtrToFileDescriptor[i].size, 4);
-		currentVolumeFile.read(&volumePtrToFileDescriptor[i].extSize, 4);
-		currentVolumeFile.read(&volumePtrToFileDescriptor[i].unk3, 4);
+		volumePtrToFileDescriptor[i].offset = currentVolumeFile.readSint32BE();
+		volumePtrToFileDescriptor[i].size = currentVolumeFile.readSint32BE();
+		volumePtrToFileDescriptor[i].extSize = currentVolumeFile.readSint32BE();
+		volumePtrToFileDescriptor[i].unk3 = currentVolumeFile.readSint32BE();
 	}
 
-	for (i = 0; i < volumeNumEntry; i++) {
-		bigEndianLongToNative(&volumePtrToFileDescriptor[i].offset);
-		bigEndianLongToNative(&volumePtrToFileDescriptor[i].size);
-		bigEndianLongToNative(&volumePtrToFileDescriptor[i].extSize);
-	}
-
 	strcpy(currentBaseName, entry->ident);
 
 	loadPal(entry);
@@ -355,29 +346,23 @@
 		return (0);
 	}
 
-	fileHandle.read(&numOfDisks, 2);
-	bigEndianShortToNative(&numOfDisks);
+	numOfDisks = fileHandle.readSint16BE();
+	sizeHEntry = fileHandle.readSint16BE();		// size of one header entry - 20 bytes
 
-	fileHandle.read(&sizeHEntry, 2);
-	bigEndianShortToNative(&sizeHEntry);	// size of one header entry - 20 bytes
-
 	for (i = 0; i < numOfDisks; i++) {
 		//      fread(&volumeData[i],20,1,fileHandle);
 		fileHandle.read(&volumeData[i].ident, 10);
 		fileHandle.read(&volumeData[i].ptr, 4);
-		fileHandle.read(&volumeData[i].diskNumber, 2);
-		fileHandle.read(&volumeData[i].size, 4);
+		volumeData[i].diskNumber = fileHandle.readSint16BE();
+		volumeData[i].size = fileHandle.readSint32BE();
 
-		bigEndianShortToNative(&volumeData[i].diskNumber);
 		debug(1, "Disk number: %d", volumeData[i].diskNumber);
-		bigEndianLongToNative(&volumeData[i].size);
 	}
 
 	for (i = 0; i < numOfDisks; i++) {
 		dataFileName *ptr;
 
-		fileHandle.read(&volumeData[i].size, 4);
-		bigEndianLongToNative(&volumeData[i].size);
+		volumeData[i].size = fileHandle.readSint32BE();
 
 		ptr = (dataFileName *) mallocAndZero(volumeData[i].size);
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.