aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorFilippos Karapetis2008-09-08 14:00:26 +0000
committerFilippos Karapetis2008-09-08 14:00:26 +0000
commit655bb0b1658387299856ef980d4511327abdb5f1 (patch)
tree8d8fe1cd062e0570841bd259d4b17d644c437459 /engines
parent84b97066a3d77cfcd6aa040e95b9930015e6751b (diff)
downloadscummvm-rg350-655bb0b1658387299856ef980d4511327abdb5f1.tar.gz
scummvm-rg350-655bb0b1658387299856ef980d4511327abdb5f1.tar.bz2
scummvm-rg350-655bb0b1658387299856ef980d4511327abdb5f1.zip
Don't use fileName both as a structure and as a function parameter
svn-id: r34449
Diffstat (limited to 'engines')
-rw-r--r--engines/cruise/vars.h4
-rw-r--r--engines/cruise/volume.cpp4
2 files changed, 4 insertions, 4 deletions
diff --git a/engines/cruise/vars.h b/engines/cruise/vars.h
index a325de3f36..5f65446cc5 100644
--- a/engines/cruise/vars.h
+++ b/engines/cruise/vars.h
@@ -86,7 +86,7 @@ struct filesData2Struct {
int16 field_2;
};
-struct fileName {
+struct dataFileName {
char name[13];
};
@@ -103,7 +103,7 @@ struct setHeaderEntry {
struct volumeDataStruct {
char ident[10];
- fileName *ptr;
+ dataFileName *ptr;
int16 diskNumber;
int32 size;
};
diff --git a/engines/cruise/volume.cpp b/engines/cruise/volume.cpp
index b2ff2631c0..47e2f02184 100644
--- a/engines/cruise/volume.cpp
+++ b/engines/cruise/volume.cpp
@@ -395,12 +395,12 @@ int16 readVolCnf(void) {
}
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;