- Fixed: Dehacked string replacement did not check the clusters' finaleflats.

- Changed the definition of several typedef'd structs so that they are
  properly named.
- Limited DEHSUPP lump lookup to search zdoom.pk3 only. It will no longer
  be possible to load DEHSUPP lumps from user WADs.
- Brought back the text-based DEHSUPP parser and changed it to be able to 
  reference states by label. Also changed label names of 
  DoomUnusedStates and added proper labels to all states that were
  previously forced to be the first state of an actor so that the old
  (limited) method could access them. This was done to address the following
  bug:
- Fixed: The player's death states calling A_PlayerSkinCheck should not be
  part of the state set that is accessible by Dehacked. These will produce
  error messages when mapped to non-players.

SVN r1512 (trunk)

src/am_map.cpp

@@ -200,25 +200,30 @@ CVAR (Color, am_ovthingcolor_item,		0xe88800,	CVAR_ARCHIVE);
 #define CXMTOF(x)  (MTOF((x)-m_x)/* - f_x*/)
 #define CYMTOF(y)  (f_h - MTOF((y)-m_y)/* + f_y*/)
 
-typedef struct {
+struct  fpoint_t
+{
 	int x, y;
-} fpoint_t;
+};
 
-typedef struct {
+struct fline_t
+{
 	fpoint_t a, b;
-} fline_t;
+};
 
-typedef struct {
+struct mpoint_t
+{
 	fixed_t x,y;
-} mpoint_t;
+};
 
-typedef struct {
+struct mline_t
+{
 	mpoint_t a, b;
-} mline_t;
+};
 
-typedef struct {
+struct islope_t
+{
 	fixed_t slp, islp;
-} islope_t;
+};
 
 
 

src/d_net.h

@@ -57,7 +57,7 @@
 //
 // Network packet data.
 //
-typedef struct
+struct doomcom_t
 {
 	DWORD	id;				// should be DOOMCOM_ID
 	SWORD	intnum;			// DOOM executes an int to execute commands
@@ -86,7 +86,7 @@ typedef struct
 // packet data to be sent
 	BYTE	data[MAX_MSGLEN];
 	
-} doomcom_t;
+};
 
 
 class FDynamicBuffer

src/d_protocol.h

@@ -64,7 +64,7 @@ struct zdemoheader_s {
 	BYTE	consoleplayer;
 };
 
-struct usercmd_s
+struct usercmd_t
 {
 	DWORD	buttons;
 	short	pitch;			// up/down
@@ -74,7 +74,6 @@ struct usercmd_s
 	short	sidemove;
 	short	upmove;
 };
-typedef struct usercmd_s usercmd_t;
 
 class FArchive;
 

src/f_finale.cpp

@@ -460,13 +460,13 @@ void F_TextWrite (void)
 // Casting by id Software.
 //	 in order of appearance
 //
-typedef struct
+struct castinfo_t
 {
 	const char		*name;
 	const char		*type;
 	const AActor	*info;
 	const PClass	*Class;
-} castinfo_t;
+};
 
 castinfo_t castorder[] =
 {

src/m_menu.h

@@ -116,7 +116,8 @@ typedef enum {
 
 struct GUIDName;
 
-typedef struct menuitem_s {
+struct menuitem_t
+{
 	itemtype		  type;
 	const char		 *label;
 	union {
@@ -159,7 +160,7 @@ typedef struct menuitem_s {
 		int				  highlight;
 		int				  flagmask;
 	} e;
-} menuitem_t;
+};
 
 struct menu_t {
 	const char	   *texttitle;
@@ -190,7 +191,7 @@ struct valueenum_t {
 	const char *name;	// Name on menu
 };
 
-typedef struct
+struct oldmenuitem_t
 {
 	// -1 = no cursor here, 1 = ok, 2 = arrows ok
 	SBYTE		status;
@@ -206,9 +207,9 @@ typedef struct
 	//	 choice=0:leftarrow,1:rightarrow
 	void		(*routine)(int choice);
 	int			textcolor;
-} oldmenuitem_t;
+};
 
-typedef struct oldmenu_s
+struct oldmenu_t
 {
 	short				numitems;		// # of menu items
 	oldmenuitem_t		*menuitems;		// menu items
@@ -216,9 +217,9 @@ typedef struct oldmenu_s
 	short				x;
 	short				y;				// x,y of menu
 	short				lastOn; 		// last item user was on in menu
-} oldmenu_t;
+};
 
-typedef struct
+struct menustack_t
 {
 	union {
 		menu_t *newmenu;
@@ -226,7 +227,7 @@ typedef struct
 	} menu;
 	bool isNewStyle;
 	bool drawSkull;
-} menustack_t;
+};
 
 extern value_t YesNo[2];
 extern value_t NoYes[2];

src/m_misc.cpp

@@ -401,7 +401,7 @@ void M_LoadDefaults ()
 //
 
 
-typedef struct
+struct pcx_t
 {
 	char				manufacturer;
 	char				version;
@@ -424,7 +424,7 @@ typedef struct
 	unsigned short		palette_type;
 	
 	char				filler[58];
-} pcx_t;
+};
 
 
 //

src/p_buildmap.cpp

@@ -41,7 +41,7 @@
 //   bits 9-15: reserved
 
 	//40 bytes
-typedef struct
+struct sectortype
 {
 	SWORD wallptr, wallnum;
 	SDWORD ceilingz, floorz;
@@ -54,7 +54,7 @@ typedef struct
 	BYTE floorpal, floorxpanning, floorypanning;
 	BYTE visibility, filler;
 	SWORD lotag, hitag, extra;
-} sectortype;
+};
 
 //cstat:
 //   bit 0: 1 = Blocking wall (use with clipmove, getzrange)         "B"
@@ -70,7 +70,7 @@ typedef struct
 //   bits 10-15: reserved
 
 	//32 bytes
-typedef struct
+struct walltype
 {
 	SDWORD x, y;
 	SWORD point2, nextwall, nextsector, cstat;
@@ -78,7 +78,7 @@ typedef struct
 	SBYTE shade;
 	BYTE pal, xrepeat, yrepeat, xpanning, ypanning;
 	SWORD lotag, hitag, extra;
-} walltype;
+};
 
 //cstat:
 //   bit 0: 1 = Blocking sprite (use with clipmove, getzrange)       "B"
@@ -96,7 +96,7 @@ typedef struct
 //   bit 15: 1 = Invisible sprite, 0 = not invisible
 
 	//44 bytes
-typedef struct
+struct spritetype
 {
 	SDWORD x, y, z;
 	SWORD cstat, picnum;
@@ -107,7 +107,7 @@ typedef struct
 	SWORD sectnum, statnum;
 	SWORD ang, owner, xvel, yvel, zvel;
 	SWORD lotag, hitag, extra;
-} spritetype;
+};
 
 struct SlopeWork
 {

src/p_local.h

@@ -150,16 +150,16 @@ void	P_NoiseAlert (AActor* target, AActor* emmiter, bool splash);
 //
 // P_MAPUTL
 //
-typedef struct
+struct divline_t
 {
 	fixed_t 	x;
 	fixed_t 	y;
 	fixed_t 	dx;
 	fixed_t 	dy;
 	
-} divline_t;
+};
 
-typedef struct
+struct intercept_t
 {
 	fixed_t 	frac;			// along trace line
 	bool	 	isaline;
@@ -168,7 +168,7 @@ typedef struct
 		AActor *thing;
 		line_t *line;
 	} d;
-} intercept_t;
+};
 
 typedef bool (*traverser_t) (intercept_t *in);
 
@@ -470,14 +470,14 @@ bool EV_OpenPolyDoor (line_t *line, int polyNum, int speed, angle_t angle, int d
 
 // [RH] Data structure for P_SpawnMapThing() to keep track
 //		of polyobject-related things.
-typedef struct polyspawns_s
+struct polyspawns_t
 {
-	struct polyspawns_s *next;
+	polyspawns_t *next;
 	fixed_t x;
 	fixed_t y;
 	short angle;
 	short type;
-} polyspawns_t;
+};
 
 enum
 {

src/p_pspr.h

@@ -62,14 +62,14 @@ inline FArchive &operator<< (FArchive &arc, psprnum_t &i)
 }
 */
 
-typedef struct pspdef_s
+struct pspdef_t
 {
 	FState*		state;	// a NULL state means not active
 	int 		tics;
 	fixed_t 	sx;
 	fixed_t 	sy;
 
-} pspdef_t;
+};
 
 class FArchive;
 

src/r_bsp.cpp

@@ -139,9 +139,10 @@ void R_ClearDrawSegs (void)
 // should use it, since smaller arrays fit better in cache.
 //
 
-typedef struct {
+struct cliprange_t
+{
 	short first, last;		// killough
-} cliprange_t;
+};
 
 
 // newend is one past the last valid seg

src/s_sndseq.cpp

@@ -89,10 +89,11 @@ typedef enum
 	SS_CMD_END
 } sscmds_t;
 
-typedef struct {
+struct hexenseq_t
+{
 	ENamedName	Name;
 	BYTE		Seqs[4];
-} hexenseq_t;
+};
 
 class DSeqActorNode : public DSeqNode
 {

src/sdl/i_system.h

@@ -130,12 +130,12 @@ unsigned int I_MSTime (void);
 
 // Directory searching routines
 
-typedef struct
+struct findstate_t
 {
     int count;
     struct dirent **namelist;
     int current;
-} findstate_t;
+};
 
 void *I_FindFirst (const char *filespec, findstate_t *fileinfo);
 int I_FindNext (void *handle, findstate_t *fileinfo);

src/wi_stuff.cpp

@@ -123,10 +123,10 @@ typedef enum
 		
 } animenum_t;
 
-typedef struct
+struct yahpt_t
 {
 	int x, y;
-} yahpt_t;
+};
 
 struct lnode_t
 {
@@ -146,7 +146,7 @@ struct lnode_t
 //
 
 #define MAX_ANIMATION_FRAMES 20
-typedef struct
+struct in_anim_t
 {
 	int			type;	// Made an int so I can use '|'
 	int 		period;	// period in tics between animations
@@ -162,7 +162,7 @@ typedef struct
 	
 	char		levelname[9];
 	char		levelname2[9];
-} in_anim_t;
+};
 
 static TArray<lnode_t> lnodes;
 static TArray<in_anim_t> anims;