mirror of
https://github.com/KartKrewDev/RingRacers.git
synced 2025-10-30 08:01:28 +00:00
Merge branch 'preview-prison-pickups' into 'master'
Preview location of Prison item boxes See merge request KartKrew/Kart!1763
This commit is contained in:
commit
4277c6d930
1 changed files with 4 additions and 2 deletions
|
|
@ -31,6 +31,8 @@
|
||||||
|
|
||||||
#define item_vfxtimer(o) ((o)->cvmem)
|
#define item_vfxtimer(o) ((o)->cvmem)
|
||||||
|
|
||||||
|
#define PREVIEWFLAGS (RF_ADD|RF_TRANS30)
|
||||||
|
|
||||||
static player_t *GetItemBoxPlayer(mobj_t *mobj)
|
static player_t *GetItemBoxPlayer(mobj_t *mobj)
|
||||||
{
|
{
|
||||||
fixed_t closest = INT32_MAX;
|
fixed_t closest = INT32_MAX;
|
||||||
|
|
@ -151,7 +153,7 @@ boolean Obj_RandomItemSpawnIn(mobj_t *mobj)
|
||||||
{
|
{
|
||||||
if (battleprisons == true)
|
if (battleprisons == true)
|
||||||
{
|
{
|
||||||
;
|
mobj->renderflags &= ~PREVIEWFLAGS; // Set in Obj_RandomItemSpawn, unset now that we're playing proper.
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
|
@ -203,7 +205,7 @@ void Obj_RandomItemSpawn(mobj_t *mobj)
|
||||||
{
|
{
|
||||||
P_UnsetThingPosition(mobj);
|
P_UnsetThingPosition(mobj);
|
||||||
mobj->flags |= (MF_NOCLIPTHING|MF_NOBLOCKMAP);
|
mobj->flags |= (MF_NOCLIPTHING|MF_NOBLOCKMAP);
|
||||||
mobj->renderflags |= RF_DONTDRAW;
|
mobj->renderflags |= PREVIEWFLAGS;
|
||||||
P_SetThingPosition(mobj);
|
P_SetThingPosition(mobj);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue