diff --git a/src/dehacked.c b/src/dehacked.c index 50d2b7ec..72d3e551 100644 --- a/src/dehacked.c +++ b/src/dehacked.c @@ -6781,8 +6781,6 @@ static const char *const STATE_LIST[] = { // array length left dynamic for sanit "S_TALLBUSH", "S_AZURECITYTREE", - "S_DKRBALLOON", // Diddy Kong Racing - // Marble Zone "S_FLAMEPARTICLE", "S_MARBLETORCH", @@ -7466,8 +7464,6 @@ static const char *const MOBJTYPE_LIST[] = { // array length left dynamic for s "MT_TALLBUSH", "MT_AZURECITYTREE", - "MT_DKRBALLOON", // Diddy Kong Racing - // Marble Zone "MT_FLAMEPARTICLE", "MT_MARBLETORCH", diff --git a/src/info.c b/src/info.c index 22c4056e..c6bc6d48 100644 --- a/src/info.c +++ b/src/info.c @@ -61,8 +61,7 @@ char sprnames[NUMSPRITES + 1][5] = "DEZL","POKE","AUDI","DECO","DOOD","SNES","GBAS","SPRS","BUZB","CHOM", "SACO","CRAB","SHAD","BRNG","BUMP","FLEN","CLAS","PSHW","ISTA","ISTB", "ARRO","ITEM","ITMO","ITMI","ITMN","WANT","PBOM","RETI","AIDU","KSPK", - "LZI1","LZI2","KLIT","PALM","SHRB","TWEE","BALN","MARB","FUFO","RUST", - "BLON", + "LZI1","LZI2","KLIT","PALM","SHRB","TWEE","MARB","FUFO","RUST","BLON", "XMS4","XMS5", "VIEW" }; @@ -3079,8 +3078,6 @@ state_t states[NUMSTATES] = {SPR_BUS2, 1, -1, {NULL}, 0, 0, S_NULL}, // S_TALLBUSH {SPR_TWEE, 0, -1, {NULL}, 0, 0, S_NULL}, // S_AZURECITYTREE - {SPR_BALN, 0, -1, {NULL}, 0, 0, S_NULL}, // S_DKRBALLOON - // Marble Zone {SPR_MARB, FF_FULLBRIGHT|FF_ANIMATE|5, TICRATE, {NULL}, 3, 3, S_NULL}, // S_FLAMEPARTICLE {SPR_MARB, FF_FULLBRIGHT|FF_ANIMATE, 8*3, {A_FlameParticle}, 3, 3, S_MARBLETORCH}, // S_MARBLETORCH @@ -16507,13 +16504,13 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = S_NULL, // xdeathstate sfx_None, // deathsound 0, // speed - 1048576, // radius - 2097152, // height + 91*FRACUNIT, // radius + 166*FRACUNIT, // height 0, // display offset - 100, // mass + 0, // mass 0, // damage sfx_None, // activesound - 33554944, // flags + MF_NOTHINK|MF_NOBLOCKMAP|MF_NOCLIP|MF_SCENERY|MF_NOGRAVITY, // flags S_NULL // raisestate }, @@ -17462,33 +17459,6 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = S_NULL // raisestate }, - { // MT_DKRBALLOON, - 2807, // doomednum - S_DKRBALLOON, // spawnstate - 1000, // spawnhealth - S_NULL, // seestate - sfx_None, // seesound - 8, // reactiontime - sfx_None, // attacksound - S_NULL, // painstate - 0, // painchance - sfx_None, // painsound - S_NULL, // meleestate - S_NULL, // missilestate - S_NULL, // deathstate - S_NULL, // xdeathstate - sfx_None, // deathsound - 0, // speed - 91*FRACUNIT, // radius - 166*FRACUNIT, // height - 0, // display offset - 0, // mass - 0, // damage - sfx_None, // activesound - MF_NOTHINK|MF_NOBLOCKMAP|MF_NOCLIP|MF_SCENERY|MF_NOGRAVITY, // flags - S_NULL // raisestate - }, - { // MT_FLAMEPARTICLE -1, // doomednum S_FLAMEPARTICLE,// spawnstate diff --git a/src/info.h b/src/info.h index 2a578bf6..ef6e5d61 100644 --- a/src/info.h +++ b/src/info.h @@ -659,8 +659,6 @@ typedef enum sprite SPR_SHRB, SPR_TWEE, - SPR_BALN, // Diddy Kong Racing - SPR_MARB, // Marble Zone sprites SPR_FUFO, // CD Special Stage UFO (don't ask me why it begins with an F) @@ -3642,8 +3640,6 @@ typedef enum state S_TALLBUSH, S_AZURECITYTREE, - S_DKRBALLOON, // Diddy Kong Racing - // Marble Zone S_FLAMEPARTICLE, S_MARBLETORCH, @@ -4344,8 +4340,6 @@ typedef enum mobj_type MT_TALLBUSH, MT_AZURECITYTREE, - MT_DKRBALLOON, // Diddy Kong Racing - // Marble Zone MT_FLAMEPARTICLE, MT_MARBLETORCH,