stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2025-01-17 23:21:22 +00:00
Code Issues Projects Releases Packages Wiki Activity

Reduced GETFLAG macro args to just one as requested, true/yes are also valid now like with level header flags params (everything else is considered 'off')

Browse source
This commit is contained in:
Monster Iestyn 2016-08-08 22:34:47 +01:00
parent f46ec64958
commit 841ee6eca0
1 changed files with 19 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
src/r_things.c
View file

@ -2666,25 +2666,28 @@ void R_AddSkins(UINT16 wadnum)
GETFLOAT(camerascale)
#undef GETFLOAT
#define GETFLAG(field, flag) else if (!stricmp(stoken, #field)) { \
if (atoi(value) == 1) \
skin->flags |= flag; \
#define GETFLAG(field) else if (!stricmp(stoken, #field)) { \
strupr(value); \
if (atoi(value) || value[0] == 'T' || value[0] == 'Y') \
skin->flags |= (SF_##field); \
else \
skin->flags &= ~flag; \
skin->flags &= ~(SF_##field); \
}
// parameters for individual character flags
GETFLAG(super, SF_SUPER)
GETFLAG(superanims, SF_SUPERANIMS)
GETFLAG(superspin, SF_SUPERSPIN)
GETFLAG(hires, SF_HIRES)
GETFLAG(noskid, SF_NOSKID)
GETFLAG(nospeedadjust, SF_NOSPEEDADJUST)
GETFLAG(runonwater, SF_RUNONWATER)
GETFLAG(nojumpspin, SF_NOJUMPSPIN)
GETFLAG(nojumpdamage, SF_NOJUMPDAMAGE)
GETFLAG(stompdamage, SF_STOMPDAMAGE)
GETFLAG(mariodamage, SF_MARIODAMAGE)
GETFLAG(machine, SF_MACHINE)
// these are uppercase so they can be concatenated with SF_
// 1, true, yes are all valid values
GETFLAG(SUPER)
GETFLAG(SUPERANIMS)
GETFLAG(SUPERSPIN)
GETFLAG(HIRES)
GETFLAG(NOSKID)
GETFLAG(NOSPEEDADJUST)
GETFLAG(RUNONWATER)
GETFLAG(NOJUMPSPIN)
GETFLAG(NOJUMPDAMAGE)
GETFLAG(STOMPDAMAGE)
GETFLAG(MARIODAMAGE)
GETFLAG(MACHINE)
#undef GETFLAG
else // let's check if it's a sound, otherwise error out