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

- added DSDA's passover/nopassover keys to the MAPINFO parser.

Browse source
This commit is contained in:
Christoph Oelckers 2023-08-22 23:09:47 +02:00
parent 99fd354dd9
commit be2f9c8660
1 changed files with 10 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/gamedata/g_mapinfo.cpp
View file

@ -1695,6 +1695,7 @@ enum EMIType
MITYPE_CLRFLAG3, MITYPE_CLRFLAG3,
MITYPE_SCFLAGS3, MITYPE_SCFLAGS3,
MITYPE_COMPATFLAG, MITYPE_COMPATFLAG,
MITYPE_CLRCOMPATFLAG,
}; };
struct MapInfoFlagHandler struct MapInfoFlagHandler
@ -1799,6 +1800,8 @@ MapFlagHandlers[] =
{ "avoidmelee", MITYPE_SETFLAG3, LEVEL3_AVOIDMELEE, 0 }, { "avoidmelee", MITYPE_SETFLAG3, LEVEL3_AVOIDMELEE, 0 },
{ "attenuatelights", MITYPE_SETFLAG3, LEVEL3_ATTENUATE, 0 }, { "attenuatelights", MITYPE_SETFLAG3, LEVEL3_ATTENUATE, 0 },
{ "nobotnodes", MITYPE_IGNORE, 0, 0 }, // Skulltag option: nobotnodes { "nobotnodes", MITYPE_IGNORE, 0, 0 }, // Skulltag option: nobotnodes
{ "nopassover", MITYPE_COMPATFLAG, COMPATF_NO_PASSMOBJ, 0 },
{ "passover", MITYPE_CLRCOMPATFLAG, COMPATF_NO_PASSMOBJ, 0 },
{ "compat_shorttex", MITYPE_COMPATFLAG, COMPATF_SHORTTEX, 0 }, { "compat_shorttex", MITYPE_COMPATFLAG, COMPATF_SHORTTEX, 0 },
{ "compat_stairs", MITYPE_COMPATFLAG, COMPATF_STAIRINDEX, 0 }, { "compat_stairs", MITYPE_COMPATFLAG, COMPATF_STAIRINDEX, 0 },
{ "compat_limitpain", MITYPE_COMPATFLAG, COMPATF_LIMITPAIN, 0 }, { "compat_limitpain", MITYPE_COMPATFLAG, COMPATF_LIMITPAIN, 0 },
@ -1950,6 +1953,13 @@ void FMapInfoParser::ParseMapDefinition(level_info_t &info)
info.flags3 = (info.flags3 & handler->data2) | handler->data1; info.flags3 = (info.flags3 & handler->data2) | handler->data1;
break; break;
case MITYPE_CLRCOMPATFLAG:
info.compatflags &= ~handler->data1;
info.compatflags2 &= ~handler->data2;
info.compatmask |= handler->data1;
info.compatmask2 |= handler->data2;
break;
case MITYPE_COMPATFLAG: case MITYPE_COMPATFLAG:
{ {
int set = 1; int set = 1;