OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

Merge branch '4.14.2' into gz_merge

Browse source
This commit is contained in:
Ricardo Luís Vaz Silva 2025-05-02 17:15:41 -03:00
commit 9aa44fa13b
83 changed files with 927 additions and 270 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/scripting/thingdef_data.cpp
View file

@ -389,6 +389,7 @@ static FFlagDef ActorFlagDefs[]=
DEFINE_FLAG(RF2, ISOMETRICSPRITES, AActor, renderflags2),
DEFINE_FLAG(RF2, SQUAREPIXELS, AActor, renderflags2),
DEFINE_FLAG(RF2, STRETCHPIXELS, AActor, renderflags2),
DEFINE_FLAG(RF2, LIGHTMULTALPHA, AActor, renderflags2),
// Bounce flags
DEFINE_FLAG2(BOUNCE_Walls, BOUNCEONWALLS, AActor, BounceFlags),

13
src/scripting/vmthunks.cpp
View file

@ -2269,6 +2269,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)
{
@ -2282,13 +2283,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)