lifning/SRB2
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge branch 'EOL-36' into EOL

Browse source 
# Conflicts:
#	src/p_enemy.c
This commit is contained in:
Alam Ed Arias 2018-11-27 23:27:27 -05:00
parent 4bd2781055 e39e689aeb
commit d7fb5b1b8c
2 changed files with 17 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/p_enemy.c
View file

@ -3327,8 +3327,8 @@ void A_MonitorPop(mobj_t *actor)
// Run a linedef executor immediately upon popping
// You may want to delay your effects by 18 tics to sync with the reward giving
if (actor->spawnpoint && (actor->spawnpoint->options & MTF_EXTRA) && (actor->spawnpoint->angle & 16384))
P_LinedefExecute((actor->spawnpoint->angle & 16383), actor->target, NULL);
if (actor->spawnpoint && actor->lastlook)
P_LinedefExecute(actor->lastlook, actor->target, NULL);
}
// Function: A_GoldMonitorPop
@ -3412,6 +3412,11 @@ void A_GoldMonitorPop(mobj_t *actor)
newmobj->sprite = SPR_TV1P;
}
}
// Run a linedef executor immediately upon popping
// You may want to delay your effects by 18 tics to sync with the reward giving
if (actor->spawnpoint && actor->lastlook)
P_LinedefExecute(actor->lastlook, actor->target, NULL);
}
// Function: A_GoldMonitorRestore

10
src/p_mobj.c
View file

@ -10894,6 +10894,16 @@ ML_EFFECT4 : Don't clip inside the ground
mobj->flags2 |= MF2_OBJECTFLIP;
}
// Extra functionality
if (mthing->options & MTF_EXTRA)
{
if (mobj->flags & MF_MONITOR && (mthing->angle & 16384))
{
// Store line exec tag to run upon popping
mobj->lastlook = (mthing->angle & 16383);
}
}
// Final set of not being able to draw nightsitems.
if (mobj->flags & MF_NIGHTSITEM)
mobj->flags2 |= MF2_DONTDRAW;