thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2026-04-27 20:41:46 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add MF_ELEMENTAL

Browse source
This commit is contained in:
James R 2023-11-13 19:20:29 -08:00
parent 74d1f1bfb7
commit b11f340dab
4 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/d_clisrv.c
View file

@ -5618,7 +5618,7 @@ static INT16 Consistancy(void)
if (TypeIsNetSynced(mo->type) == false) if (TypeIsNetSynced(mo->type) == false)
continue; continue;
if (mo->flags & (MF_SPECIAL | MF_SOLID | MF_PUSHABLE | MF_BOSS | MF_MISSILE | MF_SPRING | MF_FIRE | MF_ENEMY | MF_PAIN | MF_DONTPUNT)) if (mo->flags & (MF_SPECIAL | MF_SOLID | MF_PUSHABLE | MF_BOSS | MF_MISSILE | MF_SPRING | MF_ELEMENTAL | MF_FIRE | MF_ENEMY | MF_PAIN | MF_DONTPUNT))
{ {
ret -= mo->type; ret -= mo->type;
ret += mo->x; ret += mo->x;

2
src/deh_tables.c
View file

@ -5987,7 +5987,7 @@ const char *const MOBJFLAG_LIST[] = {
"SLOPE", "SLOPE",
"MISSILE", "MISSILE",
"SPRING", "SPRING",
"\x01", // free: 1<<17 (name un-matchable) "ELEMENTAL",
"NOTHINK", "NOTHINK",
"NOCLIPHEIGHT", "NOCLIPHEIGHT",
"ENEMY", "ENEMY",

3
src/p_mobj.h
View file

@ -137,7 +137,8 @@ typedef enum
MF_MISSILE = 1<<15, MF_MISSILE = 1<<15,
// Item is a spring. // Item is a spring.
MF_SPRING = 1<<16, MF_SPRING = 1<<16,
// free: 1<<17 // Object is elemental. If it is punted, it will evaporate.
MF_ELEMENTAL = 1<<17,
// Don't run the thinker for this object. // Don't run the thinker for this object.
MF_NOTHINK = 1<<18, MF_NOTHINK = 1<<18,
// Don't adjust z if below or above floorz/ceilingz // Don't adjust z if below or above floorz/ceilingz

2
src/r_bbox.c
View file

@ -240,7 +240,7 @@ static boolean is_tangible (mobj_t *thing)
// These objects probably do nothing! :D // These objects probably do nothing! :D
if ((thing->flags & (MF_SPECIAL|MF_SOLID|MF_SHOOTABLE if ((thing->flags & (MF_SPECIAL|MF_SOLID|MF_SHOOTABLE
|MF_PUSHABLE|MF_BOSS|MF_MISSILE|MF_SPRING |MF_PUSHABLE|MF_BOSS|MF_MISSILE|MF_SPRING
|MF_ENEMY|MF_PAIN|MF_DONTPUNT |MF_ELEMENTAL|MF_ENEMY|MF_PAIN|MF_DONTPUNT
|MF_PICKUPFROMBELOW)) == 0U) |MF_PICKUPFROMBELOW)) == 0U)
{ {
return false; return false;