Removed lot of unnecessary typedefs; added a NUM_PERSONS constant; renamed _X/_Y vars to avoid conflicts with system headers on various systems (see bug #1716109)

svn-id: r26798

1 files changed, 0 insertions, 24 deletions

diff --git a/engines/cruise/vars.h b/engines/cruise/vars.h
index 7f66ed389f..71368218ad 100644
--- a/engines/cruise/vars.h
+++ b/engines/cruise/vars.h
@@ -35,8 +35,6 @@ struct menuElementSubStruct {
 	int16 var4;
 };
 
-typedef struct menuElementSubStruct menuElementSubStruct;
-
 struct menuElementStruct {
 	struct menuElementStruct *next;
 	const char *string;
@@ -49,8 +47,6 @@ struct menuElementStruct {
 	menuElementSubStruct *ptrSub;
 };
 
-typedef struct menuElementStruct menuElementStruct;
-
 typedef int32(*opcodeTypeFunction) (void);
 typedef int16(*opcodeFunction) (void);
 
@@ -83,28 +79,20 @@ struct mediumVarStruct {
 	int16 field_20;
 };
 
-typedef struct mediumVarStruct mediumVarStruct;
-
 struct filesDataStruct {
 	uint8 *field_0;
 	uint8 *field_4;
 };
 
-typedef struct filesDataStruct filesDataStruct;
-
 struct filesData2Struct {
 	int16 field_0;
 	int16 field_2;
 };
 
-typedef struct filesData2Struct filesData2Struct;
-
 struct fileName {
 	uint8 name[13];
 };
 
-typedef struct fileName fileName;
-
 struct setHeaderEntry {
 	int16 field_0;		// offset ptr part 1
 	int16 field_2;		// offset ptr part 2
@@ -116,8 +104,6 @@ struct setHeaderEntry {
 	int16 field_E;
 };
 
-typedef struct setHeaderEntry setHeaderEntry;
-
 struct volumeDataStruct {
 	char ident[10];
 	fileName *ptr;
@@ -125,8 +111,6 @@ struct volumeDataStruct {
 	int32 size;
 };
 
-typedef struct volumeDataStruct volumeDataStruct;
-
 struct fileEntry {
 	uint8 name[14];
 	int32 offset;
@@ -135,8 +119,6 @@ struct fileEntry {
 	int32 unk3;		// unused
 };
 
-typedef struct fileEntry fileEntry;
-
 struct dataFileEntrySub {
 	uint8 *ptr;
 	int16 index;		// sprite index
@@ -148,8 +130,6 @@ struct dataFileEntrySub {
 	int16 field_1C;
 };
 
-typedef struct dataFileEntrySub dataFileEntrySub;
-
 struct dataFileEntry {
 	int16 widthInColumn;
 	int16 width;
@@ -158,16 +138,12 @@ struct dataFileEntry {
 	dataFileEntrySub subData;
 };
 
-typedef struct dataFileEntry dataFileEntry;
-
 struct systemStringsStruct {
 	int8 param;
 	uint8 string[12];
 	uint8 bootScriptName[8];
 };
 
-typedef struct systemStringsStruct systemStringsStruct;
-
 extern filesDataStruct filesData[90];
 extern filesData2Struct filesData2[90];