zdoom
/
qzdoom
mirror of https://github.com/ZDoom/qzdoom.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

This commit is contained in:
Christoph Oelckers 2020-05-25 21:23:25 +02:00
parent dbb1819238 7d5df1dd7e
commit 730f64e447
3 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/gamedata/gi.cpp
View File

@ -440,6 +440,7 @@ void FMapInfoParser::ParseGameInfo()
GAMEINFOKEY_STRING(statusscreen_dm, "statscreen_dm") GAMEINFOKEY_STRING(statusscreen_dm, "statscreen_dm")
GAMEINFOKEY_TWODOUBLES(normforwardmove, "normforwardmove") GAMEINFOKEY_TWODOUBLES(normforwardmove, "normforwardmove")
GAMEINFOKEY_TWODOUBLES(normsidemove, "normsidemove") GAMEINFOKEY_TWODOUBLES(normsidemove, "normsidemove")
GAMEINFOKEY_BOOL(nomergepickupmsg, "nomergepickupmsg")
else else
{ {

1
src/gamedata/gi.h
View File

@ -206,6 +206,7 @@ struct gameinfo_t
double normforwardmove[2]; double normforwardmove[2];
double normsidemove[2]; double normsidemove[2];
int fullscreenautoaspect = 0; int fullscreenautoaspect = 0;
bool nomergepickupmsg;
const char *GetFinalePage(unsigned int num) const; const char *GetFinalePage(unsigned int num) const;
}; };

4
src/playsim/a_pickups.cpp
View File

@ -41,6 +41,7 @@
#include "d_player.h" #include "d_player.h"
#include "vm.h" #include "vm.h"
#include "g_levellocals.h" #include "g_levellocals.h"
#include "gi.h"
EXTERN_CVAR(Bool, sv_unlimited_pickup) EXTERN_CVAR(Bool, sv_unlimited_pickup)
@ -55,7 +56,8 @@ static FString StaticLastMessage;
void PrintPickupMessage(bool localview, const FString &str) 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; StaticLastMessageTic = gametic;
StaticLastMessage = str; StaticLastMessage = str;