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

[fingolfin at users.sourceforge.net]

Revision: 26647
          http://scummvm.svn.sourceforge.net/scummvm/?rev=26647&view=rev
Author:   fingolfin
Date:     2007-04-28 02:03:11 -0700 (Sat, 28 Apr 2007)

Log Message:
-----------
Some minor cleanup (but we need to get rid of fopen/fread use here)

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

Modified: scummvm/trunk/engines/cruise/stack.h
===================================================================
--- scummvm/trunk/engines/cruise/stack.h	2007-04-28 07:33:02 UTC (rev 26646)
+++ scummvm/trunk/engines/cruise/stack.h	2007-04-28 09:03:11 UTC (rev 26647)
@@ -27,6 +27,8 @@
 
 namespace Cruise {
 
+// TODO: Replace this with Common::Stack
+
 #define SIZE_STACK 0x200
 
 enum stackElementTypeEnum {

Modified: scummvm/trunk/engines/cruise/stringSupport.cpp
===================================================================
--- scummvm/trunk/engines/cruise/stringSupport.cpp	2007-04-28 07:33:02 UTC (rev 26646)
+++ scummvm/trunk/engines/cruise/stringSupport.cpp	2007-04-28 09:03:11 UTC (rev 26647)
@@ -38,8 +38,4 @@
 	return strcmp((char *)string1, (char *)string2);
 }
 
-FILE *fopenuint8(void *name, const void *param) {
-	return fopen((char *)name, (const char *)param);
-}
-
 } // End of namespace Cruise

Modified: scummvm/trunk/engines/cruise/stringSupport.h
===================================================================
--- scummvm/trunk/engines/cruise/stringSupport.h	2007-04-28 07:33:02 UTC (rev 26646)
+++ scummvm/trunk/engines/cruise/stringSupport.h	2007-04-28 09:03:11 UTC (rev 26647)
@@ -27,10 +27,11 @@
 
 namespace Cruise {
 
+// TODO: Get rid of these and this file (either use strcpy directly, or switch to Common::String)
+
 void strcpyuint8(void *dest, const void *source);
 void strcatuint8(void *dest, const void *source);
 uint8 strcmpuint8(const void *string1, const void *string2);
-FILE *fopenuint8(void *name, const void *param);
 
 } // End of namespace Cruise
 

Modified: scummvm/trunk/engines/cruise/volume.cpp
===================================================================
--- scummvm/trunk/engines/cruise/volume.cpp	2007-04-28 07:33:02 UTC (rev 26646)
+++ scummvm/trunk/engines/cruise/volume.cpp	2007-04-28 09:03:11 UTC (rev 26647)
@@ -175,19 +175,6 @@
 	} while (character);
 }
 
-int16 fileExist(uint8 *fileName) {
-	FILE *fHandle;
-
-	fHandle = fopenuint8(fileName, "rb");
-
-	if (fHandle) {
-		fclose(fHandle);
-		return (0);
-	}
-
-	return (1);
-}
-
 void freeDisk(void) {
 	if (currentVolumeFile.isOpen()) {
 		currentVolumeFile.close();
@@ -243,7 +230,7 @@
 	strcatuint8(string, diskNumberString);
 	strcatuint8(string, " EN ");
 
-//      while(fileExist(fileName))
+	//while (Common::File::exists((const char*)fileName))
 	{
 		if (!messageDrawn) {
 			drawMsgString(string);

Modified: scummvm/trunk/engines/cruise/volume.h
===================================================================
--- scummvm/trunk/engines/cruise/volume.h	2007-04-28 07:33:02 UTC (rev 26646)
+++ scummvm/trunk/engines/cruise/volume.h	2007-04-28 09:03:11 UTC (rev 26647)
@@ -29,7 +29,6 @@
 
 int16 readVolCnf(void);
 int16 findFileInDisks(uint8 * fileName);
-int16 fileExist(uint8 * fileName);
 void freeDisk(void);
 int16 findFileInList(uint8 * fileName);
 


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