- most WORD and SWORD are gone.

Author: coelckers

src/CMakeLists.txt

@@ -755,6 +755,8 @@ file( GLOB HEADER_FILES
 	scripting/decorate/*.h
 	scripting/zscript/*.h
 	scripting/vm/*.h
+	timidity/*.h
+	wildmidi/*.h
 	xlat/*.h
 	gl/*.h
 	gl/api/*.h

src/actor.h

@@ -511,7 +511,7 @@ typedef TFlags<ActorFlag5> ActorFlags5;
 typedef TFlags<ActorFlag6> ActorFlags6;
 typedef TFlags<ActorFlag7> ActorFlags7;
 typedef TFlags<ActorRenderFlag> ActorRenderFlags;
-typedef TFlags<ActorBounceFlag, WORD> ActorBounceFlags;
+typedef TFlags<ActorBounceFlag, uint16_t> ActorBounceFlags;
 DEFINE_TFLAGS_OPERATORS (ActorFlags)
 DEFINE_TFLAGS_OPERATORS (ActorFlags2)
 DEFINE_TFLAGS_OPERATORS (ActorFlags3)
@@ -746,7 +746,7 @@ class AActor : public DThinker
 	void DestroyAllInventory ();
 
 	// Set the alphacolor field properly
-	void SetShade (DWORD rgb);
+	void SetShade (uint32_t rgb);
 	void SetShade (int r, int g, int b);
 
 	// Plays a conversation animation
@@ -991,8 +991,8 @@ class AActor : public DThinker
 	uint8_t			fountaincolor;		// Split out of 'effect' to have easier access.
 	FRenderStyle	RenderStyle;		// Style to draw this actor with
 	FTextureID		picnum;				// Draw this instead of sprite if valid
-	DWORD			fillcolor;			// Color to draw when STYLE_Shaded
-	DWORD			Translation;
+	uint32_t			fillcolor;			// Color to draw when STYLE_Shaded
+	uint32_t			Translation;
 
 	ActorRenderFlags	renderflags;		// Different rendering flags
 	ActorFlags		flags;
@@ -1045,7 +1045,7 @@ class AActor : public DThinker
 	int				projectileKickback;
 
 	// [BB] If 0, everybody can see the actor, if > 0, only members of team (VisibleToTeam-1) can see it.
-	DWORD			VisibleToTeam;
+	uint32_t			VisibleToTeam;
 
 	int				special1;		// Special info
 	int				special2;		// Special info
@@ -1055,9 +1055,9 @@ class AActor : public DThinker
 	int				weaponspecial;	// Special info for weapons.
 	int 			health;
 	uint8_t			movedir;		// 0-7
-	SBYTE			visdir;
-	SWORD			movecount;		// when 0, select a new dir
-	SWORD			strafecount;	// for MF3_AVOIDMELEE
+	int8_t			visdir;
+	int16_t			movecount;		// when 0, select a new dir
+	int16_t			strafecount;	// for MF3_AVOIDMELEE
 	TObjPtr<AActor*> target;			// thing being chased/attacked (or NULL)
 									// also the originator for missiles
 	TObjPtr<AActor*>	lastenemy;		// Last known enemy -- killough 2/15/98
@@ -1070,7 +1070,7 @@ class AActor : public DThinker
 	player_t		*player;		// only valid if type of APlayerPawn
 	TObjPtr<AActor*>	LastLookActor;	// Actor last looked for (if TIDtoHate != 0)
 	DVector3		SpawnPoint; 	// For nightmare respawn
-	WORD			SpawnAngle;
+	uint16_t			SpawnAngle;
 	int				StartHealth;
 	uint8_t			WeaveIndexXY;	// Separated from special2 because it's used by globally accessible functions.
 	uint8_t			WeaveIndexZ;
@@ -1092,9 +1092,9 @@ class AActor : public DThinker
 	int				waterlevel;		// 0=none, 1=feet, 2=waist, 3=eyes
 	uint8_t			boomwaterlevel;	// splash information for non-swimmable water sectors
 	uint8_t			MinMissileChance;// [RH] If a random # is > than this, then missile attack.
-	SBYTE			LastLookPlayerNumber;// Player number last looked for (if TIDtoHate == 0)
+	int8_t			LastLookPlayerNumber;// Player number last looked for (if TIDtoHate == 0)
 	ActorBounceFlags	BounceFlags;	// which bouncing type?
-	DWORD			SpawnFlags;		// Increased to DWORD because of Doom 64
+	uint32_t			SpawnFlags;		// Increased to uint32_t because of Doom 64
 	double			meleerange;		// specifies how far a melee attack reaches.
 	double			meleethreshold;	// Distance below which a monster doesn't try to shoot missiles anynore
 									// but instead tries to come closer for a melee attack.
@@ -1137,13 +1137,13 @@ class AActor : public DThinker
 
 
 	TObjPtr<AInventory*>	Inventory;		// [RH] This actor's inventory
-	DWORD			InventoryID;	// A unique ID to keep track of inventory items
+	uint32_t			InventoryID;	// A unique ID to keep track of inventory items
 
 	uint8_t smokecounter;
 	uint8_t FloatBobPhase;
 	uint8_t FriendPlayer;				// [RH] Player # + 1 this friendly monster works for (so 0 is no player, 1 is player 0, etc)
 	PalEntry BloodColor;
-	DWORD BloodTranslation;
+	uint32_t BloodTranslation;
 
 	// [RH] Stuff that used to be part of an Actor Info
 	FSoundIDNoInit SeeSound;
@@ -1160,7 +1160,7 @@ class AActor : public DThinker
 	double MaxStepHeight;
 
 	int32_t Mass;
-	SWORD PainChance;
+	int16_t PainChance;
 	int PainThreshold;
 	FNameNoInit DamageType;
 	FNameNoInit DamageTypeReceived;
@@ -1545,7 +1545,7 @@ template<class T> inline T *Spawn()	// for inventory items we do not need coordi
 }
 
 void PrintMiscActorInfo(AActor * query);
-AActor *P_LinePickActor(AActor *t1, DAngle angle, double distance, DAngle pitch, ActorFlags actorMask, DWORD wallMask);
+AActor *P_LinePickActor(AActor *t1, DAngle angle, double distance, DAngle pitch, ActorFlags actorMask, uint32_t wallMask);
 
 // If we want to make P_AimLineAttack capable of handling arbitrary portals, it needs to pass a lot more info than just the linetarget actor.
 struct FTranslatedLineTarget

src/am_map.cpp

@@ -256,7 +256,7 @@ struct AMColorset
 			c[i].FromCVar(*values[i]);
 		}
 
-		DWORD ba = *(values[0]);
+		uint32_t ba = *(values[0]);
 
 		int r = RPART(ba) - 16;
 		int g = GPART(ba) - 16;
@@ -791,7 +791,7 @@ static bool stopped = true;
 static void AM_calcMinMaxMtoF();
 
 static void DrawMarker (FTexture *tex, double x, double y, int yadjust,
-	INTBOOL flip, double xscale, double yscale, int translation, double alpha, DWORD fillcolor, FRenderStyle renderstyle);
+	INTBOOL flip, double xscale, double yscale, int translation, double alpha, uint32_t fillcolor, FRenderStyle renderstyle);
 
 void AM_rotatePoint (double *x, double *y);
 void AM_rotate (double *x, double *y, DAngle an);
@@ -1920,7 +1920,7 @@ void AM_drawSubsectors()
 
 		// Fill the points array from the subsector.
 		points.Resize(subsectors[i].numlines);
-		for (DWORD j = 0; j < subsectors[i].numlines; ++j)
+		for (uint32_t j = 0; j < subsectors[i].numlines; ++j)
 		{
 			mpoint_t pt = { subsectors[i].firstline[j].v1->fX(),
 							subsectors[i].firstline[j].v1->fY() };
@@ -2911,7 +2911,7 @@ void AM_drawThings ()
 //=============================================================================
 
 static void DrawMarker (FTexture *tex, double x, double y, int yadjust,
-	INTBOOL flip, double xscale, double yscale, int translation, double alpha, DWORD fillcolor, FRenderStyle renderstyle)
+	INTBOOL flip, double xscale, double yscale, int translation, double alpha, uint32_t fillcolor, FRenderStyle renderstyle)
 {
 	if (tex == NULL || tex->UseType == FTexture::TEX_Null)
 	{
@@ -2932,7 +2932,7 @@ static void DrawMarker (FTexture *tex, double x, double y, int yadjust,
 		DTA_TranslationIndex, translation,
 		DTA_Alpha, alpha,
 		DTA_FillColor, fillcolor,
-		DTA_RenderStyle, DWORD(renderstyle),
+		DTA_RenderStyle, uint32_t(renderstyle),
 		TAG_DONE);
 }
 
@@ -2977,7 +2977,7 @@ void AM_drawAuthorMarkers ()
 
 		FTextureID picnum;
 		FTexture *tex;
-		WORD flip = 0;
+		uint16_t flip = 0;
 
 		if (mark->picnum.isValid())
 		{

src/basictypes.h

@@ -37,8 +37,8 @@ typedef int						INTBOOL;
 typedef struct _GUID
 {
     DWORD	Data1;
-    WORD	Data2;
-    WORD	Data3;
+    uint16_t Data2;
+	uint16_t Data3;
     uint8_t	Data4[8];
 } GUID;
 #endif

src/c_console.cpp

@@ -94,7 +94,7 @@ CVAR(Bool, con_notablist, false, CVAR_ARCHIVE)
 
 
 static FTextureID conback;
-static DWORD conshade;
+static uint32_t conshade;
 static bool conline;
 
 extern int		gametic;

src/c_cvars.cpp

@@ -74,7 +74,7 @@ FBaseCVar::FBaseCVar (const FBaseCVar &var)
 	I_FatalError ("Use of cvar copy constructor");
 }
 
-FBaseCVar::FBaseCVar (const char *var_name, DWORD flags, void (*callback)(FBaseCVar &))
+FBaseCVar::FBaseCVar (const char *var_name, uint32_t flags, void (*callback)(FBaseCVar &))
 {
 	FBaseCVar *var;
 
@@ -573,8 +573,8 @@ UCVarValue FBaseCVar::FromString (const char *value, ECVarType type)
 		if (i == 38 && value[i] == 0)
 		{
 			cGUID.Data1 = strtoul (value + 1, NULL, 16);
-			cGUID.Data2 = (WORD)strtoul (value + 10, NULL, 16);
-			cGUID.Data3 = (WORD)strtoul (value + 15, NULL, 16);
+			cGUID.Data2 = (uint16_t)strtoul (value + 10, NULL, 16);
+			cGUID.Data3 = (uint16_t)strtoul (value + 15, NULL, 16);
 			cGUID.Data4[0] = HexToByte (value + 20);
 			cGUID.Data4[1] = HexToByte (value + 22);
 			cGUID.Data4[2] = HexToByte (value + 25);
@@ -690,7 +690,7 @@ DEFINE_ACTION_FUNCTION(_CVar, GetRealType)
 // Boolean cvar implementation
 //
 
-FBoolCVar::FBoolCVar (const char *name, bool def, DWORD flags, void (*callback)(FBoolCVar &))
+FBoolCVar::FBoolCVar (const char *name, bool def, uint32_t flags, void (*callback)(FBoolCVar &))
 : FBaseCVar (name, flags, reinterpret_cast<void (*)(FBaseCVar &)>(callback))
 {
 	DefaultValue = def;
@@ -748,7 +748,7 @@ void FBoolCVar::DoSet (UCVarValue value, ECVarType type)
 // Integer cvar implementation
 //
 
-FIntCVar::FIntCVar (const char *name, int def, DWORD flags, void (*callback)(FIntCVar &))
+FIntCVar::FIntCVar (const char *name, int def, uint32_t flags, void (*callback)(FIntCVar &))
 : FBaseCVar (name, flags, reinterpret_cast<void (*)(FBaseCVar &)>(callback))
 {
 	DefaultValue = def;
@@ -806,7 +806,7 @@ void FIntCVar::DoSet (UCVarValue value, ECVarType type)
 // Floating point cvar implementation
 //
 
-FFloatCVar::FFloatCVar (const char *name, float def, DWORD flags, void (*callback)(FFloatCVar &))
+FFloatCVar::FFloatCVar (const char *name, float def, uint32_t flags, void (*callback)(FFloatCVar &))
 : FBaseCVar (name, flags, reinterpret_cast<void (*)(FBaseCVar &)>(callback))
 {
 	DefaultValue = def;
@@ -874,7 +874,7 @@ void FFloatCVar::DoSet (UCVarValue value, ECVarType type)
 // String cvar implementation
 //
 
-FStringCVar::FStringCVar (const char *name, const char *def, DWORD flags, void (*callback)(FStringCVar &))
+FStringCVar::FStringCVar (const char *name, const char *def, uint32_t flags, void (*callback)(FStringCVar &))
 : FBaseCVar (name, flags, reinterpret_cast<void (*)(FBaseCVar &)>(callback))
 {
 	DefaultValue = copystring (def);
@@ -943,7 +943,7 @@ void FStringCVar::DoSet (UCVarValue value, ECVarType type)
 // Color cvar implementation
 //
 
-FColorCVar::FColorCVar (const char *name, int def, DWORD flags, void (*callback)(FColorCVar &))
+FColorCVar::FColorCVar (const char *name, int def, uint32_t flags, void (*callback)(FColorCVar &))
 : FIntCVar (name, def, flags, reinterpret_cast<void (*)(FIntCVar &)>(callback))
 {
 }
@@ -1024,7 +1024,7 @@ int FColorCVar::ToInt2 (UCVarValue value, ECVarType type)
 // GUID cvar implementation
 //
 
-FGUIDCVar::FGUIDCVar (const char *name, const GUID *def, DWORD flags, void (*callback)(FGUIDCVar &))
+FGUIDCVar::FGUIDCVar (const char *name, const GUID *def, uint32_t flags, void (*callback)(FGUIDCVar &))
 : FBaseCVar (name, flags, reinterpret_cast<void (*)(FBaseCVar &)>(callback))
 {
 	if (def != NULL)
@@ -1141,7 +1141,7 @@ DEFINE_ACTION_FUNCTION(_CVar, ResetToDefault)
 // the network. The "host" cvar is responsible for that.
 //
 
-FFlagCVar::FFlagCVar (const char *name, FIntCVar &realvar, DWORD bitval)
+FFlagCVar::FFlagCVar (const char *name, FIntCVar &realvar, uint32_t bitval)
 : FBaseCVar (name, 0, NULL),
 ValueVar (realvar),
 BitVal (bitval)
@@ -1246,7 +1246,7 @@ void FFlagCVar::DoSet (UCVarValue value, ECVarType type)
 // Similar to FFlagCVar but can have multiple bits
 //
 
-FMaskCVar::FMaskCVar (const char *name, FIntCVar &realvar, DWORD bitval)
+FMaskCVar::FMaskCVar (const char *name, FIntCVar &realvar, uint32_t bitval)
 : FBaseCVar (name, 0, NULL),
 ValueVar (realvar),
 BitVal (bitval)
@@ -1354,7 +1354,7 @@ static int sortcvars (const void *a, const void *b)
 	return strcmp (((*(FBaseCVar **)a))->GetName(), ((*(FBaseCVar **)b))->GetName());
 }
 
-void FilterCompactCVars (TArray<FBaseCVar *> &cvars, DWORD filter)
+void FilterCompactCVars (TArray<FBaseCVar *> &cvars, uint32_t filter)
 {
 	// Accumulate all cvars that match the filter flags.
 	for (FBaseCVar *cvar = CVars; cvar != NULL; cvar = cvar->m_Next)
@@ -1370,15 +1370,15 @@ void FilterCompactCVars (TArray<FBaseCVar *> &cvars, DWORD filter)
 	}
 }
 
-void C_WriteCVars (uint8_t **demo_p, DWORD filter, bool compact)
+void C_WriteCVars (uint8_t **demo_p, uint32_t filter, bool compact)
 {
 	FString dump = C_GetMassCVarString(filter, compact);
 	size_t dumplen = dump.Len() + 1;	// include terminating \0
 	memcpy(*demo_p, dump.GetChars(), dumplen);
 	*demo_p += dumplen;
 }
 
-FString C_GetMassCVarString (DWORD filter, bool compact)
+FString C_GetMassCVarString (uint32_t filter, bool compact)
 {
 	FBaseCVar *cvar;
 	FString dump;
@@ -1420,7 +1420,7 @@ void C_ReadCVars (uint8_t **demo_p)
 	{       // compact mode
 		TArray<FBaseCVar *> cvars;
 		FBaseCVar *cvar;
-		DWORD filter;
+		uint32_t filter;
 
 		ptr++;
 		breakpt = strchr (ptr, '\\');
@@ -1613,7 +1613,7 @@ FBaseCVar *GetUserCVar(int playernum, const char *cvarname)
 //
 //===========================================================================
 
-FBaseCVar *C_CreateCVar(const char *var_name, ECVarType var_type, DWORD flags)
+FBaseCVar *C_CreateCVar(const char *var_name, ECVarType var_type, uint32_t flags)
 {
 	assert(FindCVar(var_name, NULL) == NULL);
 	flags |= CVAR_AUTO;
@@ -1634,7 +1634,7 @@ void UnlatchCVars (void)
 
 	while (LatchedValues.Pop (var))
 	{
-		DWORD oldflags = var.Variable->Flags;
+		uint32_t oldflags = var.Variable->Flags;
 		var.Variable->Flags &= ~(CVAR_LATCH | CVAR_SERVERINFO);
 		var.Variable->SetGenericRep (var.Value, var.Type);
 		if (var.Type == CVAR_String)
@@ -1643,7 +1643,7 @@ void UnlatchCVars (void)
 	}
 }
 
-void DestroyCVarsFlagged (DWORD flags)
+void DestroyCVarsFlagged (uint32_t flags)
 {
 	FBaseCVar *cvar = CVars;
 	FBaseCVar *next = cvar;
@@ -1808,7 +1808,7 @@ void FBaseCVar::ListVars (const char *filter, bool plain)
 	{
 		if (CheckWildcards (filter, var->GetName()))
 		{
-			DWORD flags = var->GetFlags();
+			uint32_t flags = var->GetFlags();
 			if (plain)
 			{ // plain formatting does not include user-defined cvars
 				if (!(flags & CVAR_UNSETTABLE))

src/c_cvars.h

@@ -165,7 +165,7 @@ class FBaseCVar
 	friend FBaseCVar *FindCVar (const char *var_name, FBaseCVar **prev);
 	friend FBaseCVar *FindCVarSub (const char *var_name, int namelen);
 	friend void UnlatchCVars (void);
-	friend void DestroyCVarsFlagged (DWORD flags);
+	friend void DestroyCVarsFlagged (uint32_t flags);
 	friend void C_ArchiveCVars (FConfigFile *f, uint32 filter);
 	friend void C_SetCVarsToDefaults (void);
 	friend void FilterCompactCVars (TArray<FBaseCVar *> &cvars, uint32 filter);
@@ -196,13 +196,13 @@ FBaseCVar *GetCVar(AActor *activator, const char *cvarname);
 FBaseCVar *GetUserCVar(int playernum, const char *cvarname);
 
 // Create a new cvar with the specified name and type
-FBaseCVar *C_CreateCVar(const char *var_name, ECVarType var_type, DWORD flags);
+FBaseCVar *C_CreateCVar(const char *var_name, ECVarType var_type, uint32_t flags);
 
 // Called from G_InitNew()
 void UnlatchCVars (void);
 
 // Destroy CVars with the matching flags; called from CCMD(restart)
-void DestroyCVarsFlagged (DWORD flags);
+void DestroyCVarsFlagged (uint32_t flags);
 
 // archive cvars to FILE f
 void C_ArchiveCVars (FConfigFile *f, uint32 filter);