zdoom/gzdoom-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom-gles.git synced 2024-12-11 04:51:13 +00:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source 
# Conflicts:
#	src/g_inventory/a_pickups.cpp
This commit is contained in:
Marisa Kirisame 2020-05-23 10:23:54 +02:00 committed by drfrag
parent 6851103a87
commit be13bbb9a2
3 changed files with 5 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/g_inventory/a_pickups.cpp
View file

@ -36,28 +36,22 @@
#include <assert.h>
#include "info.h"
#include "m_random.h"
#include "p_local.h"
#include "s_sound.h"
#include "gi.h"
#include "p_lnspec.h"
#include "sbar.h"
#include "statnums.h"
#include "c_dispatch.h"
#include "gstrings.h"
#include "templates.h"
#include "a_morph.h"
#include "a_specialspot.h"
#include "g_level.h"
#include "g_game.h"
#include "doomstat.h"
#include "d_player.h"
#include "p_spec.h"
#include "serializer.h"
#include "vm.h"
#include "c_functions.h"
#include "g_levellocals.h"
#include "vm.h"
#include "gi.h"
EXTERN_CVAR(Bool, sv_unlimited_pickup)
@ -72,7 +66,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;

1
src/gi.cpp
View file

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

1
src/gi.h
View file

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