OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

Use a custom naming convention for VKDoom-only stuff

Browse source
This commit is contained in:
nashmuhandes 2023-08-10 02:56:45 +08:00 • committed by Magnus Norddahl
commit 89b42e3e97
12 changed files with 41 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/am_map.cpp
View file

@ -1547,7 +1547,7 @@ void DAutomap::Ticker ()
if (!automapactive)
return;
if ((primaryLevel->flags9 & LEVEL9_NOAUTOMAP))
if ((primaryLevel->vkdflags & VKDLEVELFLAG_NOAUTOMAP))
{
AM_ToggleMap();
return;
@ -3453,7 +3453,7 @@ void AM_ToggleMap()
if (!primaryLevel || !primaryLevel->automap)
return;
if (!automapactive && (primaryLevel->flags9 & LEVEL9_NOAUTOMAP))
if (!automapactive && (primaryLevel->vkdflags & VKDLEVELFLAG_NOAUTOMAP))
return;
if (!automapactive)

2
src/console/c_cmds.cpp
View file

@ -700,7 +700,7 @@ UNSAFE_CCMD (load)
UNSAFE_CCMD(save)
{
if ((primaryLevel->flags9 & LEVEL9_NOUSERSAVE))
if ((primaryLevel->vkdflags & VKDLEVELFLAG_NOUSERSAVE))
{
Printf("%s\n", GStrings("SAVEDEAD"));
return;

2
src/g_game.cpp
View file

@ -2194,7 +2194,7 @@ CUSTOM_CVAR (Int, quicksaverotationcount, 4, CVAR_ARCHIVE|CVAR_GLOBALCONFIG)
void G_DoAutoSave ()
{
if ((primaryLevel->flags9 & LEVEL9_NOUSERSAVE))
if ((primaryLevel->vkdflags & VKDLEVELFLAG_NOUSERSAVE))
return;
FString description;

4
src/g_level.cpp
View file

@ -1793,7 +1793,7 @@ void FLevelLocals::Init()
flags = 0;
flags2 = 0;
flags3 = 0;
flags9 = 0;
vkdflags = 0;
ImpactDecalCount = 0;
frozenstate = 0;
@ -1842,7 +1842,7 @@ void FLevelLocals::Init()
flags |= info->flags;
flags2 |= info->flags2;
flags3 |= info->flags3;
flags9 |= info->flags9;
vkdflags |= info->vkdflags;
levelnum = info->levelnum;
Music = info->Music;
musicorder = info->musicorder;

3
src/g_levellocals.h
View file

@ -607,7 +607,8 @@ public:
uint32_t flags;
uint32_t flags2;
uint32_t flags3;
uint32_t flags9;
uint32_t vkdflags;
uint32_t fadeto; // The color the palette fades to (usually black)
uint32_t outsidefog; // The fog for sectors with sky ceilings

34
src/gamedata/g_mapinfo.cpp
View file

@ -250,7 +250,7 @@ void level_info_t::Reset()
else
flags2 = LEVEL2_LAXMONSTERACTIVATION;
flags3 = 0;
flags9 = 0;
vkdflags = 0;
Music = "";
LevelName = "";
AuthorName = "";
@ -1694,9 +1694,9 @@ enum EMIType
MITYPE_SETFLAG3,
MITYPE_CLRFLAG3,
MITYPE_SCFLAGS3,
MITYPE_SETFLAG9,
MITYPE_CLRFLAG9,
MITYPE_SCFLAGS9,
MITYPE_SETVKDFLAG,
MITYPE_CLRVKDFLAG,
MITYPE_SCVKDFLAGS,
MITYPE_COMPATFLAG,
};
@ -1794,9 +1794,6 @@ MapFlagHandlers[] =
{ "nolightfade", MITYPE_SETFLAG3, LEVEL3_NOLIGHTFADE, 0 },
{ "nocoloredspritelighting", MITYPE_SETFLAG3, LEVEL3_NOCOLOREDSPRITELIGHTING, 0 },
{ "forceworldpanning", MITYPE_SETFLAG3, LEVEL3_FORCEWORLDPANNING, 0 },
{ "nousersave", MITYPE_SETFLAG9, LEVEL9_NOUSERSAVE, 0 },
{ "noautomap", MITYPE_SETFLAG9, LEVEL9_NOAUTOMAP, 0 },
{ "noautosaveonenter", MITYPE_SETFLAG9, LEVEL9_NOAUTOSAVEONENTER, 0 },
{ "propermonsterfallingdamage", MITYPE_SETFLAG3, LEVEL3_PROPERMONSTERFALLINGDAMAGE, 0 },
{ "disableshadowmap", MITYPE_SETFLAG3, LEVEL3_NOSHADOWMAP, 0 },
{ "enableshadowmap", MITYPE_CLRFLAG3, LEVEL3_NOSHADOWMAP, 0 },
@ -1804,6 +1801,9 @@ MapFlagHandlers[] =
{ "disableskyboxao", MITYPE_CLRFLAG3, LEVEL3_SKYBOXAO, 0 },
{ "avoidmelee", MITYPE_SETFLAG3, LEVEL3_AVOIDMELEE, 0 },
{ "attenuatelights", MITYPE_SETFLAG3, LEVEL3_ATTENUATE, 0 },
{ "nousersave", MITYPE_SETVKDFLAG, VKDLEVELFLAG_NOUSERSAVE, 0 },
{ "noautomap", MITYPE_SETVKDFLAG, VKDLEVELFLAG_NOAUTOMAP, 0 },
{ "noautosaveonenter", MITYPE_SETVKDFLAG, VKDLEVELFLAG_NOAUTOSAVEONENTER, 0 },
{ "nobotnodes", MITYPE_IGNORE, 0, 0 }, // Skulltag option: nobotnodes
{ "compat_shorttex", MITYPE_COMPATFLAG, COMPATF_SHORTTEX, 0 },
{ "compat_stairs", MITYPE_COMPATFLAG, COMPATF_STAIRINDEX, 0 },
@ -1956,27 +1956,27 @@ void FMapInfoParser::ParseMapDefinition(level_info_t &info)
info.flags3 = (info.flags3 & handler->data2) | handler->data1;
break;
case MITYPE_SETFLAG9:
case MITYPE_SETVKDFLAG:
if (!CheckAssign())
{
info.flags9 |= handler->data1;
info.vkdflags |= handler->data1;
}
else
{
sc.MustGetNumber();
if (sc.Number) info.flags9 |= handler->data1;
else info.flags9 &= ~handler->data1;
if (sc.Number) info.vkdflags |= handler->data1;
else info.vkdflags &= ~handler->data1;
}
info.flags9 |= handler->data2;
info.vkdflags |= handler->data2;
break;
case MITYPE_CLRFLAG9:
info.flags9 &= ~handler->data1;
info.flags9 |= handler->data2;
case MITYPE_CLRVKDFLAG:
info.vkdflags &= ~handler->data1;
info.vkdflags |= handler->data2;
break;
case MITYPE_SCFLAGS9:
info.flags9 = (info.flags9 & handler->data2) | handler->data1;
case MITYPE_SCVKDFLAGS:
info.vkdflags = (info.vkdflags & handler->data2) | handler->data1;
break;
case MITYPE_COMPATFLAG:

11
src/gamedata/g_mapinfo.h
View file

@ -272,10 +272,10 @@ enum ELevelFlags : unsigned int
LEVEL3_NOJUMPDOWN = 0x00040000, // only for MBF21. Inverse of MBF's dog_jumping flag.
LEVEL3_LIGHTCREATED = 0x00080000, // a light had been created in the last frame
// Deliberately skip ahead...
LEVEL9_NOUSERSAVE = 0x00000001,
LEVEL9_NOAUTOMAP = 0x00000002,
LEVEL9_NOAUTOSAVEONENTER = 0x00000004, // don't make an autosave when entering a map
// VKDoom custom flags
VKDLEVELFLAG_NOUSERSAVE = 0x00000001,
VKDLEVELFLAG_NOAUTOMAP = 0x00000002,
VKDLEVELFLAG_NOAUTOSAVEONENTER = 0x00000004, // don't make an autosave when entering a map
};
@ -348,7 +348,8 @@ struct level_info_t
int32_t flags;
uint32_t flags2;
uint32_t flags3;
uint32_t flags9;
uint32_t vkdflags;
FString Music;
FString LevelName;

4
src/menu/doommenu.cpp
View file

@ -183,7 +183,7 @@ bool M_SetSpecialMenu(FName& menu, int param)
return false;
}
if ((primaryLevel->flags9 & LEVEL9_NOUSERSAVE))
if ((primaryLevel->vkdflags & VKDLEVELFLAG_NOUSERSAVE))
{
M_StartMessage(GStrings("SAVEDEAD"), 1);
return false;
@ -402,7 +402,7 @@ CCMD (quicksave)
return;
}
if ((primaryLevel->flags9 & LEVEL9_NOUSERSAVE))
if ((primaryLevel->vkdflags & VKDLEVELFLAG_NOUSERSAVE))
return;
if (gamestate != GS_LEVEL)

2
src/p_saveg.cpp
View file

@ -969,7 +969,7 @@ void FLevelLocals::Serialize(FSerializer &arc, bool hubload)
arc("flags", flags)
("flags2", flags2)
("flags9", flags9)
("vkdflags", vkdflags)
("fadeto", fadeto)
("found_secrets", found_secrets)
("found_items", found_items)

6
src/scripting/vmthunks.cpp
View file

@ -2763,7 +2763,7 @@ DEFINE_FIELD_X(LevelInfo, level_info_t, sucktime)
DEFINE_FIELD_X(LevelInfo, level_info_t, flags)
DEFINE_FIELD_X(LevelInfo, level_info_t, flags2)
DEFINE_FIELD_X(LevelInfo, level_info_t, flags3)
DEFINE_FIELD_X(LevelInfo, level_info_t, flags9)
DEFINE_FIELD_X(LevelInfo, level_info_t, vkdflags)
DEFINE_FIELD_X(LevelInfo, level_info_t, Music)
DEFINE_FIELD_X(LevelInfo, level_info_t, LevelName)
DEFINE_FIELD_X(LevelInfo, level_info_t, AuthorName)
@ -2852,8 +2852,8 @@ DEFINE_FIELD_BIT(FLevelLocals, flags2, infinite_flight, LEVEL2_INFINITE_FLIGHT)
DEFINE_FIELD_BIT(FLevelLocals, flags2, no_dlg_freeze, LEVEL2_CONV_SINGLE_UNFREEZE)
DEFINE_FIELD_BIT(FLevelLocals, flags2, keepfullinventory, LEVEL2_KEEPFULLINVENTORY)
DEFINE_FIELD_BIT(FLevelLocals, flags3, removeitems, LEVEL3_REMOVEITEMS)
DEFINE_FIELD_BIT(FLevelLocals, flags9, nousersave, LEVEL9_NOUSERSAVE)
DEFINE_FIELD_BIT(FLevelLocals, flags9, noautomap, LEVEL9_NOAUTOMAP)
DEFINE_FIELD_BIT(FLevelLocals, vkdflags, nousersave, VKDLEVELFLAG_NOUSERSAVE)
DEFINE_FIELD_BIT(FLevelLocals, vkdflags, noautomap, VKDLEVELFLAG_NOAUTOMAP)
DEFINE_FIELD_X(Sector, sector_t, floorplane)
DEFINE_FIELD_X(Sector, sector_t, ceilingplane)

6
wadsrc/static/zscript/constants.zs
View file

@ -1381,9 +1381,9 @@ enum ELevelFlags
LEVEL3_NOJUMPDOWN = 0x00040000, // only for MBF21. Inverse of MBF's dog_jumping flag.
LEVEL3_LIGHTCREATED = 0x00080000, // a light had been created in the last frame
LEVEL9_NOUSERSAVE = 0x00000001,
LEVEL9_NOAUTOMAP = 0x00000002,
LEVEL9_NOAUTOSAVEONENTER = 0x00000004, // don't make an autosave when entering a map
VKDLEVELFLAG_NOUSERSAVE = 0x00000001,
VKDLEVELFLAG_NOAUTOMAP = 0x00000002,
VKDLEVELFLAG_NOAUTOSAVEONENTER = 0x00000004, // don't make an autosave when entering a map
};
// [RH] Compatibility flags.

2
wadsrc/static/zscript/doombase.zs
View file

@ -337,7 +337,7 @@ struct LevelInfo native
native readonly int flags;
native readonly int flags2;
native readonly int flags3;
native readonly int flags9;
native readonly int vkdflags;
native readonly String Music;
native readonly String LevelName;
native readonly String AuthorName;