Merge branch 'stable' into unit-tests

Author: electricbrass

client/src/wi_stuff.cpp

@@ -1327,7 +1327,7 @@ static int WI_CalcWidth (const char *str)
 
 	while (*str)
 	{
-		const OLumpName charname = fmt::format("FONTB{:02u}", toupper(*str) - 32);
+		const OLumpName charname = fmt::format("FONTB{:02d}", toupper(*str) - 32);
 		int lump = W_CheckNumForName(charname);
 
 		if (lump != -1)

common/d_dehacked.cpp

@@ -2053,7 +2053,7 @@ static int PatchText(int oldSize)
 	}
 
 	good = ReadChars(&oldStr, oldSize);
-	good = good || ReadChars(&newStr, newSize);
+	good = ReadChars(&newStr, newSize) || good;
 
 	if (!good)
 	{

common/g_mapinfo.cpp

@@ -878,19 +878,19 @@ void MIType_Map07Special(OScanner& os, bool newStyleMapInfo, void* data, unsigne
 
 	// mancubus
 	bossactionvector.emplace_back();
-	bossaction_t& lastaction = bossactionvector.back();
+	bossaction_t& mancaction = bossactionvector.back();
 
-	lastaction.type = MT_FATSO;
-	lastaction.special = 23;
-	lastaction.tag = 666;
+	mancaction.type = MT_FATSO;
+	mancaction.special = 23;
+	mancaction.tag = 666;
 
 	// arachnotron
 	bossactionvector.emplace_back();
-	lastaction = bossactionvector.back();
+	bossaction_t& arachnoaction = bossactionvector.back();
 
-	lastaction.type = MT_BABY;
-	lastaction.special = 30;
-	lastaction.tag = 667;
+	arachnoaction.type = MT_BABY;
+	arachnoaction.special = 30;
+	arachnoaction.tag = 667;
 }
 
 // Sets the map to use the baron bossaction
@@ -957,9 +957,9 @@ void MIType_SpecialAction_ExitLevel(OScanner& os, bool newStyleMapInfo, void* da
 	}
 
 	bossactionvector.emplace_back();
-	bossaction_t& lastaction = bossactionvector.back();
-	lastaction.special = 11;
-	lastaction.tag = 0;
+	bossaction_t& action = bossactionvector.back();
+	action.special = 11;
+	action.tag = 0;
 }
 
 //
@@ -979,9 +979,9 @@ void MIType_SpecialAction_OpenDoor(OScanner& os, bool newStyleMapInfo, void* dat
 	}
 
 	bossactionvector.emplace_back();
-	bossaction_t& lastaction = bossactionvector.back();
-	lastaction.special = 29;
-	lastaction.tag = 666;
+	bossaction_t& action = bossactionvector.back();
+	action.special = 29;
+	action.tag = 666;
 }
 
 //
@@ -1001,9 +1001,9 @@ void MIType_SpecialAction_LowerFloor(OScanner& os, bool newStyleMapInfo, void* d
 	}
 
 	bossactionvector.emplace_back();
-	bossaction_t& lastaction = bossactionvector.back();
-	lastaction.special = 23;
-	lastaction.tag = 666;
+	bossaction_t& action = bossactionvector.back();
+	action.special = 23;
+	action.tag = 666;
 }
 
 //