Merge branch 'master' of https://github.com/coelckers/gzdoom

ZDoom · May 25, 2020 · 730f64e · 730f64e
2 parents dbb1819 + 7d5df1d
commit 730f64e
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 1 deletion.
diff --git a/src/gamedata/gi.cpp b/src/gamedata/gi.cpp
@@ -440,6 +440,7 @@ void FMapInfoParser::ParseGameInfo()
 			GAMEINFOKEY_STRING(statusscreen_dm, "statscreen_dm")
 			GAMEINFOKEY_TWODOUBLES(normforwardmove, "normforwardmove")
 			GAMEINFOKEY_TWODOUBLES(normsidemove, "normsidemove")
+			GAMEINFOKEY_BOOL(nomergepickupmsg, "nomergepickupmsg")
 
 		else
 		{

diff --git a/src/gamedata/gi.h b/src/gamedata/gi.h
@@ -206,6 +206,7 @@ struct gameinfo_t
 	double normforwardmove[2];
 	double normsidemove[2];
 	int fullscreenautoaspect = 0;
+	bool nomergepickupmsg;
 
 	const char *GetFinalePage(unsigned int num) const;
 };

diff --git a/src/playsim/a_pickups.cpp b/src/playsim/a_pickups.cpp
@@ -41,6 +41,7 @@
 #include "d_player.h"
 #include "vm.h"
 #include "g_levellocals.h"
+#include "gi.h"
 
 EXTERN_CVAR(Bool, sv_unlimited_pickup)
 
@@ -55,7 +56,8 @@ static FString StaticLastMessage;
 
 void PrintPickupMessage(bool localview, const FString &str)
 {
-	if (str.IsNotEmpty() && localview && (StaticLastMessageTic != gametic || StaticLastMessage.Compare(str)))
+	// [MK] merge identical messages on same tic unless disabled in gameinfo
+	if (str.IsNotEmpty() && localview && (gameinfo.nomergepickupmsg || StaticLastMessageTic != gametic || StaticLastMessage.Compare(str)))
 	{
 		StaticLastMessageTic = gametic;
 		StaticLastMessage = str;