Merge branch 'Secret-notify' of https://github.com/Edward850/zdoom

This commit is contained in:
Christoph Oelckers 2014-10-31 11:29:25 +01:00
commit 388454255d
2 changed files with 3 additions and 1 deletions

View file

@ -714,6 +714,7 @@ void P_SectorDamage(int tag, int amount, FName type, const PClass *protectClass,
//============================================================================
CVAR(Bool, showsecretsector, false, 0)
CVAR(Bool, cl_showsecretmessage, true, CVAR_ARCHIVE)
void P_GiveSecret(AActor *actor, bool printmessage, bool playsound, int sectornum)
{
@ -723,7 +724,7 @@ void P_GiveSecret(AActor *actor, bool printmessage, bool playsound, int sectornu
{
actor->player->secretcount++;
}
if (actor->CheckLocalView (consoleplayer))
if (cl_showsecretmessage && actor->CheckLocalView(consoleplayer))
{
if (printmessage)
{

View file

@ -1098,6 +1098,7 @@ OptionMenu MessageOptions
Title "MESSAGES"
Option "Show messages", "show_messages", "OnOff"
Option "Show obituaries", "show_obituaries", "OnOff"
Option "Show secret notifications", "cl_showsecretmessage", "OnOff"
Option "Scale text in high res", "con_scaletext", "ScaleValues"
Option "Minimum message level", "msg", "MessageLevels"
Option "Center messages", "con_centernotify", "OnOff"