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

[dreammaster at users.sourceforge.net]

Revision: 40584
          http://scummvm.svn.sourceforge.net/scummvm/?rev=40584&view=rev
Author:   dreammaster
Date:     2009-05-15 02:12:11 +0000 (Fri, 15 May 2009)

Log Message:
-----------
Converted some code from fopen to Common::File - it's not currently used, but just in case it's needed in the future

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

Modified: scummvm/trunk/engines/cruise/volume.cpp
===================================================================
--- scummvm/trunk/engines/cruise/volume.cpp	2009-05-15 00:22:53 UTC (rev 40583)
+++ scummvm/trunk/engines/cruise/volume.cpp	2009-05-15 02:12:11 UTC (rev 40584)
@@ -27,7 +27,7 @@
 
 namespace Cruise {
 
-FILE *PAL_fileHandle = NULL;
+Common::File PAL_file;
 uint8 *PAL_ptr = NULL;
 
 int16 numLoadedPal;
@@ -38,30 +38,27 @@
 void loadPal(volumeDataStruct *entry) {
 	char name[20];
 
+	// This code isn't currently being used, so return
 	return;
 
-	if (PAL_fileHandle) {
-		fclose(PAL_fileHandle);
-	}
+	if (PAL_file.isOpen())
+		PAL_file.close();
 
 	removeExtention(entry->ident, name);
 	strcat(name, ".PAL");
 
-	// FIXME: using fopen/fread is not portable. Use Common::File instead
-	PAL_fileHandle = fopen(name, "rb");
+	if (!PAL_file.open(name))
+		return;
 
-	fread(&numLoadedPal, 2, 1, PAL_fileHandle);
-	fread(&fileData2, 2, 1, PAL_fileHandle);
+	numLoadedPal = PAL_file.readSint16BE();
+	fileData2 = PAL_file.readSint16BE();
 
-	flipShort(&numLoadedPal);
-	flipShort(&fileData2);
-
-	PAL_ptr = (uint8 *) malloc(numLoadedPal * fileData2);
+	PAL_ptr = (uint8 *)malloc(numLoadedPal * fileData2);
 }
 
 void closePal(void) {
-	if (PAL_fileHandle) {
-		fclose(PAL_fileHandle);
+	if (PAL_file.isOpen()) {
+		PAL_file.close();
 
 		free(PAL_ptr);
 		PAL_ptr = NULL;
@@ -80,7 +77,7 @@
 		strcpy(currentBaseName, "");
 	}
 
-	if (PAL_fileHandle) {
+	if (PAL_file.isOpen()) {
 		closePal();
 	}
 


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