zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2025-05-30 00:31:54 +00:00
Code Issues Projects Releases Packages Wiki Activity

Added am_showlevelname CVar

Browse source 
Allows controlling the visibility of the level name on the automap.
This commit is contained in:
DyNaM1Kk 2025-04-26 23:46:38 +04:00 • committed by Ricardo Luís Vaz Silva
parent 880ebfd94c
commit b7d6f0b1a4
3 changed files with 14 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/am_map.cpp
View file

@ -170,6 +170,7 @@ CVAR(Bool, am_showmonsters, true, CVAR_ARCHIVE);
CVAR(Bool, am_showitems, false, CVAR_ARCHIVE);
CVAR(Bool, am_showtime, true, CVAR_ARCHIVE);
CVAR(Bool, am_showtotaltime, false, CVAR_ARCHIVE);
CVAR(Bool, am_showlevelname, true, CVAR_ARCHIVE);
CVAR(Int, am_colorset, 0, CVAR_ARCHIVE);
CVAR(Bool, am_customcolors, true, CVAR_ARCHIVE);
CVAR(Int, am_map_secrets, 1, CVAR_ARCHIVE);

3
src/g_statusbar/shared_sbar.cpp
View file

@ -85,6 +85,7 @@ EXTERN_CVAR (Bool, am_showsecrets)
EXTERN_CVAR (Bool, am_showitems)
EXTERN_CVAR (Bool, am_showtime)
EXTERN_CVAR (Bool, am_showtotaltime)
EXTERN_CVAR (Bool, am_showlevelname)
EXTERN_CVAR(Bool, inter_subtitles)
EXTERN_CVAR(Bool, ui_screenborder_classic_scaling)
@ -598,6 +599,8 @@ void DBaseStatusBar::DoDrawAutomapHUD(int crdefault, int highlight)
}
FormatMapName(primaryLevel, crdefault, &textbuffer);
if (textbuffer.IsEmpty())
return;
if (!generic_ui)
{

13
src/scripting/vmthunks.cpp
View file

@ -2282,6 +2282,7 @@ DEFINE_ACTION_FUNCTION_NATIVE(FLevelLocals, GetSpotState, GetSpotState)
//---------------------------------------------------------------------------
EXTERN_CVAR(Int, am_showmaplabel)
EXTERN_CVAR(Bool, am_showlevelname)
void FormatMapName(FLevelLocals *self, int cr, FString *result)
{
@ -2295,13 +2296,19 @@ void FormatMapName(FLevelLocals *self, int cr, FString *result)
if (self->info->MapLabel.IsNotEmpty())
{
if (self->info->MapLabel.Compare("*"))
*result << self->info->MapLabel << ": ";
*result << self->info->MapLabel;
}
else if (am_showmaplabel == 1 || (am_showmaplabel == 2 && !ishub))
{
*result << self->MapName << ": ";
*result << self->MapName;
}
if (am_showlevelname)
{
if (!result->IsEmpty())
*result << ": ";
*result << mapnamecolor << self->LevelName;
}
*result << mapnamecolor << self->LevelName;
}
DEFINE_ACTION_FUNCTION_NATIVE(FLevelLocals, FormatMapName, FormatMapName)