diff options
Diffstat (limited to 'engines/cruise')
| -rw-r--r-- | engines/cruise/object.cpp | 4 | ||||
| -rw-r--r-- | engines/cruise/vars.h | 4 | ||||
| -rw-r--r-- | engines/cruise/volume.cpp | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/engines/cruise/object.cpp b/engines/cruise/object.cpp index 66a3a53018..bb8d85acd0 100644 --- a/engines/cruise/object.cpp +++ b/engines/cruise/object.cpp @@ -58,7 +58,7 @@ objDataStruct *getObjectDataFromOverlay(int ovlIdx, int objIdx) { } int16 getMultipleObjectParam(int16 overlayIdx, int16 objectIdx, objectParamsQuery *returnParam) { - objectParams *ptr2; + objectParams *ptr2 = 0; objDataStruct *ptr; ovlDataStruct *ovlData; // int16 type; @@ -246,7 +246,7 @@ int16 getSingleObjectParam(int16 overlayIdx, int16 param2, int16 param3, int16 * //char* ptr3 = NULL; objDataStruct *ptr; ovlDataStruct *ovlData; - objectParams *ptr2; + objectParams *ptr2 = 0; ptr = getObjectDataFromOverlay(overlayIdx, param2); 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; |