Merge branch 'master' of https://github.com/rheit/zdoom

src/d_main.cpp

@@ -1598,7 +1598,7 @@ void D_AddConfigWads (TArray<FString> &wadfiles, const char *section)
 			{
 				// D_AddWildFile resets GameConfig's position, so remember it
 				GameConfig->GetPosition (pos);
-				D_AddWildFile (wadfiles, value);
+				D_AddWildFile (wadfiles, ExpandEnvVars(value));
 				// Reset GameConfig's position to get next wad
 				GameConfig->SetPosition (pos);
 			}
@@ -1987,8 +1987,6 @@ static void D_DoomInit()
 	Args->CollectFiles("-playdemo", ".lmp");
 	Args->CollectFiles("-file", NULL);	// anything left goes after -file
 
-	atterm (C_DeinitConsole);
-
 	gamestate = GS_STARTUP;
 
 	SetLanguageIDs ();

src/d_net.cpp

@@ -2163,7 +2163,8 @@ void Net_DoCommand (int type, BYTE **stream, int player)
 		{
 			DWORD which = ReadLong (stream);
 
-			if (gamestate == GS_LEVEL && !paused)
+			if (gamestate == GS_LEVEL && !paused
+				&& players[player].playerstate != PST_DEAD)
 			{
 				AInventory *item = players[player].mo->Inventory;
 				while (item != NULL && item->InventoryID != which)

src/p_acs.cpp

@@ -3542,14 +3542,14 @@ static const int LegacyRenderStyleIndices[] =
 	3,	// STYLE_SoulTrans,
 	4,	// STYLE_OptFuzzy,
 	5,	// STYLE_Stencil,
-	6,	// STYLE_AddStencil
-	7,	// STYLE_AddShaded
 	64,	// STYLE_Translucent
 	65,	// STYLE_Add,
 	66,	// STYLE_Shaded,
 	67,	// STYLE_TranslucentStencil,
 	68,	// STYLE_Shadow,
 	69,	// STYLE_Subtract,
+	6,	// STYLE_AddStencil
+	7,	// STYLE_AddShaded
 	-1
 };
 

src/p_interaction.cpp

@@ -1255,7 +1255,9 @@ int P_DamageMobj (AActor *target, AActor *inflictor, AActor *source, int damage,
 			// This does not save the player if damage >= TELEFRAG_DAMAGE, still need to
 			// telefrag him right? ;) (Unfortunately the damage is "absorbed" by armor,
 			// but telefragging should still do enough damage to kill the player)
-			if ((player->cheats & CF_BUDDHA) && damage < TELEFRAG_DAMAGE)
+			if ((player->cheats & CF_BUDDHA) && damage < TELEFRAG_DAMAGE
+				// Ignore players that are already dead.
+				&& player->playerstate != PST_DEAD)
 			{
 				// If this is a voodoo doll we need to handle the real player as well.
 				player->mo->health = target->health = player->health = 1;

src/sdl/i_system.cpp

@@ -353,6 +353,8 @@ void I_Quit (void)
 
     if (demorecording)
 		G_CheckDemoStatus();
+
+	C_DeinitConsole();
 }
 
 

src/sound/fmodsound.cpp

@@ -212,8 +212,11 @@ static const FEnumList ResamplerNames[] =
 	{ "No Interpolation",		FMOD_DSP_RESAMPLER_NOINTERP },
 	{ "NoInterp",				FMOD_DSP_RESAMPLER_NOINTERP },
 	{ "Linear",					FMOD_DSP_RESAMPLER_LINEAR },
+	// [BL] 64-bit version of FMOD Ex 4.26 crashes with these resamplers.
+#if !(defined(_M_X64) || defined(__amd64__)) || !(FMOD_VERSION >= 0x42600 && FMOD_VERSION <= 0x426FF)
 	{ "Cubic",					FMOD_DSP_RESAMPLER_CUBIC },
 	{ "Spline",					FMOD_DSP_RESAMPLER_SPLINE },
+#endif
 	{ NULL, 0 }
 };
 

src/win32/i_system.cpp

@@ -781,6 +781,8 @@ void I_Quit()
 	{
 		G_CheckDemoStatus();
 	}
+
+	C_DeinitConsole();
 }
 
 

wadsrc/static/actors/chex/chexweapons.txt

@@ -18,7 +18,7 @@ actor SuperBootspork : Chainsaw 2005
 actor MiniZorcher : Pistol
 {
 	game Chex
-	obituary "$OP_MPZORCH"
+	obituary "$OB_MPZORCH"
 	inventory.pickupmessage "$GOTMINIZORCHER"
 	Tag "$TAG_MINIZORCHER"
 	states
@@ -31,7 +31,7 @@ actor MiniZorcher : Pistol
 actor LargeZorcher : Shotgun 2001
 {
 	game Chex
-	obituary "$OP_MPZORCH"
+	obituary "$OB_MPZORCH"
 	inventory.pickupmessage "$GOTLARGEZORCHER"
 	Tag "$TAG_LARGEZORCHER"
 }

wadsrc/static/language.fr

@@ -991,9 +991,9 @@ HHUSTR_E5M9 = "L ECHEVAUX DE D'SPARIL";
 
 // Keys
 
-TXT_GOTBLUEKEY = "CLE BLEUE";
+TXT_GOTBLUEKEY = "CLÉ BLEUE";
-TXT_GOTYELLOWKEY = "CLE JAUNE";
+TXT_GOTYELLOWKEY = "CLÉ JAUNE";
-TXT_GOTGREENKEY = "CLE ROUGE";
+TXT_GOTGREENKEY = "CLÉ VERTE";
 
 // Artifacts