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

[thebluegr at users.sourceforge.net]

Revision: 34449
          http://scummvm.svn.sourceforge.net/scummvm/?rev=34449&view=rev
Author:   thebluegr
Date:     2008-09-08 14:00:26 +0000 (Mon, 08 Sep 2008)

Log Message:
-----------
Don't use fileName both as a structure and as a function parameter

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

Modified: scummvm/trunk/engines/cruise/vars.h
===================================================================
--- scummvm/trunk/engines/cruise/vars.h	2008-09-08 13:00:43 UTC (rev 34448)
+++ scummvm/trunk/engines/cruise/vars.h	2008-09-08 14:00:26 UTC (rev 34449)
@@ -86,7 +86,7 @@
 	int16 field_2;
 };
 
-struct fileName {
+struct dataFileName {
 	char name[13];
 };
 
@@ -103,7 +103,7 @@
 
 struct volumeDataStruct {
 	char ident[10];
-	fileName *ptr;
+	dataFileName *ptr;
 	int16 diskNumber;
 	int32 size;
 };

Modified: scummvm/trunk/engines/cruise/volume.cpp
===================================================================
--- scummvm/trunk/engines/cruise/volume.cpp	2008-09-08 13:00:43 UTC (rev 34448)
+++ scummvm/trunk/engines/cruise/volume.cpp	2008-09-08 14:00:26 UTC (rev 34449)
@@ -395,12 +395,12 @@
 	}
 
 	for (i = 0; i < numOfDisks; i++) {
-		fileName *ptr;
+		dataFileName *ptr;
 
 		fileHandle.read(&volumeData[i].size, 4);
 		flipLong(&volumeData[i].size);
 
-		ptr = (fileName *) mallocAndZero(volumeData[i].size);
+		ptr = (dataFileName *) mallocAndZero(volumeData[i].size);
 
 		volumeData[i].ptr = ptr;
 


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