diff options
author | Joost Peters | 2009-06-01 19:29:04 +0000 |
---|---|---|
committer | Joost Peters | 2009-06-01 19:29:04 +0000 |
commit | 12837c968cb8277cb89d4d8f410a6cd73d7cded6 (patch) | |
tree | bff74ef5f2f6522b1cc755206ba596709f3bd0fb /engines/cruise/volume.cpp | |
parent | a10287e787763fb4d56364fdabbe1365773ea9fb (diff) | |
download | scummvm-rg350-12837c968cb8277cb89d4d8f410a6cd73d7cded6.tar.gz scummvm-rg350-12837c968cb8277cb89d4d8f410a6cd73d7cded6.tar.bz2 scummvm-rg350-12837c968cb8277cb89d4d8f410a6cd73d7cded6.zip |
Change flip[Short|Long] functions to bigEndian[Short|Long]ToNative to clarify that flipping only occurs on LE systems + some related cleanup.
svn-id: r41107
Diffstat (limited to 'engines/cruise/volume.cpp')
-rw-r--r-- | engines/cruise/volume.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/engines/cruise/volume.cpp b/engines/cruise/volume.cpp index 6bda10b704..fda3b6bc1f 100644 --- a/engines/cruise/volume.cpp +++ b/engines/cruise/volume.cpp @@ -110,8 +110,8 @@ int getVolumeDataEntry(volumeDataStruct *entry) { currentVolumeFile.read(&volumeNumberOfEntry, 2); currentVolumeFile.read(&volumeSizeOfEntry, 2); - flipShort(&volumeNumberOfEntry); - flipShort(&volumeSizeOfEntry); + bigEndianShortToNative(&volumeNumberOfEntry); + bigEndianShortToNative(&volumeSizeOfEntry); volumeNumEntry = volumeNumberOfEntry; @@ -136,9 +136,9 @@ int getVolumeDataEntry(volumeDataStruct *entry) { } for (i = 0; i < volumeNumEntry; i++) { - flipLong(&volumePtrToFileDescriptor[i].offset); - flipLong(&volumePtrToFileDescriptor[i].size); - flipLong(&volumePtrToFileDescriptor[i].extSize); + bigEndianLongToNative(&volumePtrToFileDescriptor[i].offset); + bigEndianLongToNative(&volumePtrToFileDescriptor[i].size); + bigEndianLongToNative(&volumePtrToFileDescriptor[i].extSize); } strcpy(currentBaseName, entry->ident); @@ -356,10 +356,10 @@ int16 readVolCnf(void) { } fileHandle.read(&numOfDisks, 2); - flipShort(&numOfDisks); + bigEndianShortToNative(&numOfDisks); fileHandle.read(&sizeHEntry, 2); - flipShort(&sizeHEntry); // size of one header entry - 20 bytes + bigEndianShortToNative(&sizeHEntry); // size of one header entry - 20 bytes for (i = 0; i < numOfDisks; i++) { // fread(&volumeData[i],20,1,fileHandle); @@ -368,16 +368,16 @@ int16 readVolCnf(void) { fileHandle.read(&volumeData[i].diskNumber, 2); fileHandle.read(&volumeData[i].size, 4); - flipShort(&volumeData[i].diskNumber); + bigEndianShortToNative(&volumeData[i].diskNumber); debug(1, "Disk number: %d", volumeData[i].diskNumber); - flipLong(&volumeData[i].size); + bigEndianLongToNative(&volumeData[i].size); } for (i = 0; i < numOfDisks; i++) { dataFileName *ptr; fileHandle.read(&volumeData[i].size, 4); - flipLong(&volumeData[i].size); + bigEndianLongToNative(&volumeData[i].size); ptr = (dataFileName *) mallocAndZero(volumeData[i].size); |