Merge branch 'master' of github.com:Warzone2100/warzone2100

src/game.cpp

@@ -96,16 +96,8 @@
 #define MAX_SAVE_NAME_SIZE	60
 
 static const UDWORD NULL_ID = UDWORD_MAX;
-#define MAX_BODY			SWORD_MAX
 #define SAVEKEY_ONMISSION	0x100
 
-/*!
- * FIXME
- * The code is reusing some pointers as normal integer values apparently. This
- * should be fixed!
- */
-#define FIXME_CAST_ASSIGN(TYPE, lval, rval) memcpy(&lval, &rval, MIN(sizeof(lval), sizeof(rval)))
-
 static UDWORD RemapPlayerNumber(UDWORD OldNumber);
 static void plotFeature(char *backDropSprite);
 bool writeGameInfo(const char *pFileName);
@@ -186,7 +178,6 @@ struct TILETYPE_SAVEHEADER : public GAME_SAVEHEADER
 };
 
 /* Sanity check definitions for the save struct file sizes */
-#define GAME_HEADER_SIZE			8
 #define DROIDINIT_HEADER_SIZE		12
 #define STRUCT_HEADER_SIZE			12
 #define FEATURE_HEADER_SIZE			12

src/hci.cpp

@@ -167,12 +167,6 @@ static bool Refreshing = false;
 #define IDOPT_IVISFORM		1043		// iViS engine form
 #define IDOPT_IVISLABEL		1044		// iViS form label
 
-/* Edit screen IDs */
-#define IDED_FORM			2000		// The edit form
-#define IDED_LABEL			2001		// The edit screen label
-#define IDED_CLOSE			2002		// The edit screen close box
-#define	IDED_STATFORM		2003		// The edit screen stats form (for droids/structs/features)
-
 #define	IDPROX_START		120000		// The first proximity button
 #define	IDPROX_END		129999		// The last proximity button
 
@@ -184,8 +178,6 @@ static bool Refreshing = false;
 /* Reticule positions */
 #define RET_BUTWIDTH		25
 #define RET_BUTHEIGHT		28
-#define RET_BUTGAPX			6
-#define RET_BUTGAPY			6
 
 /* Option positions */
 #define OPT_X			(640-300)
@@ -194,7 +186,6 @@ static bool Refreshing = false;
 #define OPT_HEIGHT		350
 #define OPT_BUTWIDTH	60
 #define OPT_BUTHEIGHT	20
-#define OPT_MAPY		25
 #define OPT_EDITY		50
 #define OPT_PLAYERY		150
 
@@ -202,8 +193,6 @@ static bool Refreshing = false;
 #define STAT_BUTY				2
 
 /* Structure type screen positions */
-#define STAT_BASEWIDTH 		134	// Size of the main form.
-#define STAT_BASEHEIGHT		254
 #define STAT_GAP			2
 #define STAT_BUTWIDTH		60
 #define STAT_BUTHEIGHT		46

src/multiplay.h

@@ -117,8 +117,6 @@ extern UBYTE				bDisplayMultiJoiningStatus;	// draw load progress?
 #define CAMP_BASE				1
 #define CAMP_WALLS				2
 
-#define PING_MED				200			// this ping is crawlin'
-#define PING_HI					400			// this ping just plain sucks :P
 #define PING_LIMIT                              4000                    // If ping is bigger than this, then worry and panic, and don't even try showing the ping.
 
 #define LEV_LOW					400			// how many points to allocate for res levels???