mirror of
https://git.do.srb2.org/STJr/SRB2.git
synced 2025-02-27 22:20:49 +00:00
Merge branch 'next' into more-cleanup
This commit is contained in:
commit
52346620aa
1 changed files with 2 additions and 2 deletions
|
@ -13005,7 +13005,7 @@ static void P_SetObjectSpecial(mobj_t *mobj)
|
|||
}
|
||||
}
|
||||
|
||||
mobj_t *P_SpawnMobjFromMapThing(mapthing_t *mthing, fixed_t x, fixed_t y, fixed_t z, mobjtype_t i)
|
||||
static mobj_t *P_SpawnMobjFromMapThing(mapthing_t *mthing, fixed_t x, fixed_t y, fixed_t z, mobjtype_t i)
|
||||
{
|
||||
mobj_t *mobj = NULL;
|
||||
boolean doangle = true;
|
||||
|
@ -13372,7 +13372,7 @@ void P_SpawnItemPattern(mapthing_t *mthing, boolean bonustime)
|
|||
{
|
||||
INT32 numitems = (mthing->type & 1) ? 16 : 8;
|
||||
fixed_t size = (mthing->type & 1) ? 192*FRACUNIT : 96*FRACUNIT;
|
||||
mobjtype_t itemtypes[1] = { (mthing->type & 1) ? MT_RING : MT_BLUESPHERE };
|
||||
mobjtype_t itemtypes[1] = { (mthing->type < 606) ? MT_RING : MT_BLUESPHERE };
|
||||
P_SpawnItemCircle(mthing, itemtypes, 1, numitems, size, bonustime);
|
||||
return;
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue