mirror of
https://git.do.srb2.org/STJr/SRB2.git
synced 2025-02-03 06:51:11 +00:00
Spawn Torchflower's flame after the original object is scaled from a mapthing
This commit is contained in:
parent
1b66373a4a
commit
f1006ece34
1 changed files with 7 additions and 7 deletions
14
src/p_mobj.c
14
src/p_mobj.c
|
@ -11012,13 +11012,6 @@ mobj_t *P_SpawnMobj(fixed_t x, fixed_t y, fixed_t z, mobjtype_t type, ...)
|
||||||
mcsolid->angle = mobj->angle + ANGLE_90;
|
mcsolid->angle = mobj->angle + ANGLE_90;
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case MT_TORCHFLOWER:
|
|
||||||
{
|
|
||||||
mobj_t *fire = P_SpawnMobjFromMobj(mobj, 0, 0, 46*FRACUNIT, MT_FLAME);
|
|
||||||
if (!P_MobjWasRemoved(fire))
|
|
||||||
P_SetTarget(&mobj->target, fire);
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
case MT_PYREFLY:
|
case MT_PYREFLY:
|
||||||
mobj->extravalue1 = (FixedHypot(mobj->x, mobj->y)/FRACUNIT) % 360;
|
mobj->extravalue1 = (FixedHypot(mobj->x, mobj->y)/FRACUNIT) % 360;
|
||||||
mobj->extravalue2 = 0;
|
mobj->extravalue2 = 0;
|
||||||
|
@ -13012,6 +13005,13 @@ static boolean P_SetupSpawnedMapThing(mapthing_t *mthing, mobj_t *mobj, boolean
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
case MT_TORCHFLOWER:
|
||||||
|
{
|
||||||
|
mobj_t *fire = P_SpawnMobjFromMobj(mobj, 0, 0, 46*FRACUNIT, MT_FLAME);
|
||||||
|
if (!P_MobjWasRemoved(fire))
|
||||||
|
P_SetTarget(&mobj->target, fire);
|
||||||
|
break;
|
||||||
|
}
|
||||||
case MT_CANDLE:
|
case MT_CANDLE:
|
||||||
case MT_CANDLEPRICKET:
|
case MT_CANDLEPRICKET:
|
||||||
if (mthing->args[0])
|
if (mthing->args[0])
|
||||||
|
|
Loading…
Reference in a new issue