diff --git a/src/info.c b/src/info.c index 95b7f716..67b9fddb 100644 --- a/src/info.c +++ b/src/info.c @@ -14688,7 +14688,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = { // MT_MINESHIELD -1, // doomednum - S_BOMBSHIELD1, // spawnstate + S_MINESHIELD1, // spawnstate 1000, // spawnhealth S_NULL, // seestate sfx_None, // seesound @@ -14699,7 +14699,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = sfx_None, // painsound S_NULL, // meleestate S_NULL, // missilestate - S_BOMBEXPLODE, // deathstate + S_MINEEXPLODE, // deathstate S_NULL, // xdeathstate sfx_None, // deathsound 10*FRACUNIT, // speed @@ -14715,7 +14715,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = { // MT_MINEITEM -1, // doomednum - S_BOMBAIR1, // spawnstate + S_MINEAIR1, // spawnstate 1, // spawnhealth S_NULL, // seestate sfx_tossed, // seesound @@ -14726,7 +14726,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = sfx_None, // painsound S_NULL, // meleestate S_NULL, // missilestate - S_BOMBEXPLODE, // deathstate + S_MINEEXPLODE, // deathstate S_NULL, // xdeathstate sfx_None, // deathsound 0, // speed @@ -14742,7 +14742,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = { // MT_MINEEXPLOSION -1, // doomednum - S_BOMBEXPLOSION1, // spawnstate + S_MINEEXPLOSION1, // spawnstate 1000, // spawnhealth S_NULL, // seestate sfx_None, // seesound @@ -14915,7 +14915,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = sfx_None, // painsound S_NULL, // meleestate S_NULL, // missilestate - S_BOMBEXPLODE, // deathstate + S_MINEEXPLODE, // deathstate S_NULL, // xdeathstate sfx_None, // deathsound 0, // speed diff --git a/src/p_map.c b/src/p_map.c index 2fba1002..bdd97655 100644 --- a/src/p_map.c +++ b/src/p_map.c @@ -841,7 +841,7 @@ static boolean PIT_CheckThing(mobj_t *thing) if (thing->type == MT_PLAYER && thing->player) { - if (tmthing->state == &states[S_BOMBEXPLOSION1]) + if (tmthing->state == &states[S_MINEEXPLOSION1]) K_ExplodePlayer(thing->player, tmthing->target); else K_SpinPlayer(thing->player, tmthing->target); @@ -1167,7 +1167,7 @@ static boolean PIT_CheckThing(mobj_t *thing) else if (thing->type == MT_MINEEXPLOSION && tmthing->player) { // Player Damage - if (thing->state == &states[S_BOMBEXPLOSION1]) + if (thing->state == &states[S_MINEEXPLOSION1]) K_ExplodePlayer(tmthing->player, thing->target); else K_SpinPlayer(tmthing->player, thing->target);