- GCC warning cleanup

SVN r4031 (trunk)

src/compatibility.cpp

@@ -59,7 +59,7 @@
 struct FCompatOption
 {
 	const char *Name;
-	int CompatFlags;
+	DWORD CompatFlags;
 	int WhichSlot;
 };
 

src/d_player.h

@@ -427,7 +427,7 @@ extern player_t players[MAXPLAYERS];
 
 FArchive &operator<< (FArchive &arc, player_t *&p);
 
-void P_CheckPlayerSprite(AActor *mo, unsigned &spritenum, fixed_t &scalex, fixed_t &scaley);
+void P_CheckPlayerSprite(AActor *mo, int &spritenum, fixed_t &scalex, fixed_t &scaley);
 
 inline void AActor::SetFriendPlayer(player_t *player)
 {

src/doomdef.h

@@ -333,7 +333,7 @@ enum
 	COMPATF_HITSCAN			= 1 << 28,	// Hitscans use original blockmap anf hit check code.
 	COMPATF_LIGHT			= 1 << 29,	// Find neighboring light level like Doom
 	COMPATF_POLYOBJ			= 1 << 30,	// Draw polyobjects the old fashioned way
-	COMPATF_MASKEDMIDTEX	= 1 << 31,	// Ignore compositing when drawing masked midtextures
+	COMPATF_MASKEDMIDTEX	= 1u << 31,	// Ignore compositing when drawing masked midtextures
 
 	COMPATF2_BADANGLES		= 1 << 0,	// It is impossible to face directly NSEW.
 	COMPATF2_FLOORMOVE		= 1 << 1,	// Use the same floor motion behavior as Doom.

src/oplsynth/OPL3.cpp

@@ -89,6 +89,7 @@ public:
 	double leftPan, rightPan;
 	
 	Channel (int baseAddress, double startvol);
+	virtual ~Channel() {}
 	void update_2_KON1_BLOCK3_FNUMH2(class OPL3 *OPL3);
 	void update_FNUML8(class OPL3 *OPL3);
 	void update_CHD1_CHC1_CHB1_CHA1_FB3_CNT1(class OPL3 *OPL3);

src/p_mobj.cpp

@@ -2618,7 +2618,7 @@ AActor *AActor::TIDHash[128];
 
 void AActor::ClearTIDHashes ()
 {
-	memset(TIDHash, NULL, sizeof(TIDHash));
+	memset(TIDHash, 0, sizeof(TIDHash));
 }
 
 //
@@ -6083,22 +6083,22 @@ void PrintMiscActorInfo(AActor *query)
 			"OptFuzzy", "Stencil", "Translucent", "Add", "Shaded", "TranslucentStencil"};
 
 		Printf("%s @ %p has the following flags:\n\tflags: %x", query->GetTag(), query, query->flags);
-		for (flagi = 0; flagi < 31; flagi++)
+		for (flagi = 0; flagi <= 31; flagi++)
 			if (query->flags & 1<<flagi) Printf(" %s", FLAG_NAME(1<<flagi, flags));
 		Printf("\n\tflags2: %x", query->flags2);
-		for (flagi = 0; flagi < 31; flagi++)
+		for (flagi = 0; flagi <= 31; flagi++)
 			if (query->flags2 & 1<<flagi) Printf(" %s", FLAG_NAME(1<<flagi, flags2));
 		Printf("\n\tflags3: %x", query->flags3);
-		for (flagi = 0; flagi < 31; flagi++)
+		for (flagi = 0; flagi <= 31; flagi++)
 			if (query->flags3 & 1<<flagi) Printf(" %s", FLAG_NAME(1<<flagi, flags3));
 		Printf("\n\tflags4: %x", query->flags4);
-		for (flagi = 0; flagi < 31; flagi++)
+		for (flagi = 0; flagi <= 31; flagi++)
 			if (query->flags4 & 1<<flagi) Printf(" %s", FLAG_NAME(1<<flagi, flags4));
 		Printf("\n\tflags5: %x", query->flags5);
-		for (flagi = 0; flagi < 31; flagi++)
+		for (flagi = 0; flagi <= 31; flagi++)
 			if (query->flags5 & 1<<flagi) Printf(" %s", FLAG_NAME(1<<flagi, flags5));
 		Printf("\n\tflags6: %x", query->flags6);
-		for (flagi = 0; flagi < 31; flagi++)
+		for (flagi = 0; flagi <= 31; flagi++)
 			if (query->flags6 & 1<<flagi) Printf(" %s", FLAG_NAME(1<<flagi, flags6));
 		Printf("\nBounce style: %x\nBounce factors: f:%f, w:%f\nBounce flags: %x", 
 			query->BounceFlags, FIXED2FLOAT(query->bouncefactor), 

src/p_user.cpp

@@ -1488,7 +1488,7 @@ DEFINE_ACTION_FUNCTION(AActor, A_CheckPlayerDone)
 //
 //===========================================================================
 
-void P_CheckPlayerSprite(AActor *actor, unsigned &spritenum, fixed_t &scalex, fixed_t &scaley)
+void P_CheckPlayerSprite(AActor *actor, int &spritenum, fixed_t &scalex, fixed_t &scaley)
 {
 	player_t *player = actor->player;
 	int crouchspriteno;

src/r_things.cpp

@@ -523,7 +523,7 @@ void R_ProjectSprite (AActor *thing, int fakeside, F3DFloor *fakefloor, F3DFloor
 	tex = NULL;
 	voxel = NULL;
 
-	unsigned spritenum = thing->sprite;
+	int spritenum = thing->sprite;
 	fixed_t spritescaleX = thing->scaleX;
 	fixed_t spritescaleY = thing->scaleY;
 	if (thing->player != NULL)
@@ -565,7 +565,7 @@ void R_ProjectSprite (AActor *thing, int fakeside, F3DFloor *fakefloor, F3DFloor
 	{
 		// decide which texture to use for the sprite
 #ifdef RANGECHECK
-		if (spritenum >= (unsigned)sprites.Size ())
+		if (spritenum >= (signed)sprites.Size () || spritenum < 0)
 		{
 			DPrintf ("R_ProjectSprite: invalid sprite number %u\n", spritenum);
 			return;

src/thingdef/thingdef.h

@@ -19,7 +19,7 @@ class FScanner;
 
 struct FFlagDef
 {
-	int flagbit;
+	unsigned int flagbit;
 	const char *name;
 	int structoffset;
 };
@@ -27,7 +27,7 @@ struct FFlagDef
 FFlagDef *FindFlag (const PClass *type, const char *part1, const char *part2);
 void HandleDeprecatedFlags(AActor *defaults, FActorInfo *info, bool set, int index);
 bool CheckDeprecatedFlags(AActor *actor, FActorInfo *info, int index);
-const char *GetFlagName(int flagnum, int flagoffset);
+const char *GetFlagName(unsigned int flagnum, int flagoffset);
 
 #define FLAG_NAME(flagnum, flagvar) GetFlagName(flagnum, myoffsetof(AActor, flagvar))
 

src/thingdef/thingdef_data.cpp

@@ -428,7 +428,7 @@ FFlagDef *FindFlag (const PClass *type, const char *part1, const char *part2)
 //
 //==========================================================================
 
-const char *GetFlagName(int flagnum, int flagoffset)
+const char *GetFlagName(unsigned int flagnum, int flagoffset)
 {
 	for(unsigned i = 0; i < countof(ActorFlags); i++)
 	{

src/w_wad.cpp

@@ -839,7 +839,7 @@ void FWadCollection::RenameNerve ()
 		{
 			continue;
 		}
-		if (fr->GetLength() != nervesize)
+		if (fr->GetLength() != (long)nervesize)
 		{
 			// Skip MD5 computation when there is a
 			// cheaper way to know this is not the file