Fix battlemode item boxes not respawning (closes #135)
This commit is contained in:
parent
15aded75f9
commit
5834d6ea5a
3 changed files with 3 additions and 2 deletions
|
|
@ -572,7 +572,6 @@ void K_RespawnBattleBoxes(void)
|
||||||
newmobj->flags2 = box->flags2;
|
newmobj->flags2 = box->flags2;
|
||||||
P_RemoveMobj(box); // make sure they disappear
|
P_RemoveMobj(box); // make sure they disappear
|
||||||
numgotboxes--; // you've restored a box, remove it from the count
|
numgotboxes--; // you've restored a box, remove it from the count
|
||||||
//continue; -- irrelevant?
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (numgotboxes < 0)
|
if (numgotboxes < 0)
|
||||||
|
|
|
||||||
|
|
@ -13686,7 +13686,6 @@ static boolean P_SetupSpawnedMapThing(mapthing_t *mthing, mobj_t *mobj, boolean
|
||||||
case MT_RANDOMITEM:
|
case MT_RANDOMITEM:
|
||||||
{
|
{
|
||||||
mobj->flags2 |= MF2_BOSSNOTRAP; // mark as here on map start
|
mobj->flags2 |= MF2_BOSSNOTRAP; // mark as here on map start
|
||||||
nummapboxes++;
|
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
case MT_ITEMCAPSULE:
|
case MT_ITEMCAPSULE:
|
||||||
|
|
|
||||||
|
|
@ -782,6 +782,9 @@ static void P_SpawnMapThings(boolean spawnemblems)
|
||||||
if (!spawnemblems && mt->type == mobjinfo[MT_EMBLEM].doomednum)
|
if (!spawnemblems && mt->type == mobjinfo[MT_EMBLEM].doomednum)
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
|
if (mt->type == mobjinfo[MT_RANDOMITEM].doomednum)
|
||||||
|
nummapboxes++;
|
||||||
|
|
||||||
// Don't spawn non-patch objects of this type if they are uneeded
|
// Don't spawn non-patch objects of this type if they are uneeded
|
||||||
if (mt->patch == false && basemaptyperemoval[mt->type] == true)
|
if (mt->patch == false && basemaptyperemoval[mt->type] == true)
|
||||||
continue;
|
continue;
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue