diff --git a/src/info.c b/src/info.c index e3bbf3b2a..cf0281e8b 100644 --- a/src/info.c +++ b/src/info.c @@ -22331,7 +22331,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = // SRB2kart MT's { // MT_RANDOMITEM - 2011, // doomednum + 2000, // doomednum S_RANDOMITEM1, // spawnstate 1000, // spawnhealth S_NULL, // seestate diff --git a/src/k_objects.h b/src/k_objects.h index 95a565587..de8a558ae 100644 --- a/src/k_objects.h +++ b/src/k_objects.h @@ -122,6 +122,7 @@ void Obj_AudienceThink(mobj_t * mobj, boolean focusonplayer); void Obj_RandomItemVisuals(mobj_t *mobj); boolean Obj_RandomItemSpawnIn(mobj_t *mobj); fixed_t Obj_RandomItemScale(fixed_t oldScale); +void Obj_RandomItemSpawn(mobj_t *mobj); #ifdef __cplusplus } // extern "C" diff --git a/src/p_mobj.c b/src/p_mobj.c index 2b0bfc036..82135b18a 100644 --- a/src/p_mobj.c +++ b/src/p_mobj.c @@ -12128,16 +12128,6 @@ static boolean P_SpawnNonMobjMapThing(mapthing_t *mthing) static boolean P_AllowMobjSpawn(mapthing_t* mthing, mobjtype_t i) { - //(void)mthing; - - if (mthing->type == 2000) - { - // TEMP: old item spot ID, while we're testing big items. - // Return MT_RANDOMITEM from 2011 to 2000 later, - // and then remove this when we're done. - return false; - } - switch (i) { case MT_ITEMCAPSULE: