OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

Add mapinfo option to disable merging of identical pickup messages on same tic

Browse source
This commit is contained in:
Mari the Deer 2020-05-23 10:23:54 +02:00 • committed by Christoph Oelckers
commit 7d5df1dd7e
3 changed files with 5 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/playsim/a_pickups.cpp
View file

@ -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;