From 2689d9cf1bb944254f83bc1b3089e8cfb9cbd0f1 Mon Sep 17 00:00:00 2001 From: TehRealSalt Date: Wed, 13 Jun 2018 23:37:37 -0400 Subject: [PATCH] Random items poof instead of sparkle Also added a poof when they respawn in Battle --- src/info.c | 2 +- src/m_menu.c | 6 +++--- src/p_mobj.c | 6 +++++- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/src/info.c b/src/info.c index a0ea3c32b..dbeee245f 100644 --- a/src/info.c +++ b/src/info.c @@ -14285,7 +14285,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = 16*FRACUNIT, // radius 32*FRACUNIT, // height 0, // display offset - MT_SPARK, // mass + MT_EXPLODE, // mass 0, // damage sfx_None, // activesound MF_NOCLIP, // flags diff --git a/src/m_menu.c b/src/m_menu.c index 385fa78d2..7146890f6 100644 --- a/src/m_menu.c +++ b/src/m_menu.c @@ -1480,12 +1480,12 @@ static menuitem_t OP_NetgameOptionsMenu[] = {IT_STRING | IT_CVAR, NULL, "Frantic Items", &cv_kartfrantic, 34}, {IT_STRING | IT_CVAR, NULL, "Item Respawn", &cv_itemrespawn, 50}, - {IT_STRING | IT_CVAR, NULL, "Item Respawn time", &cv_itemrespawntime, 58}, + {IT_STRING | IT_CVAR, NULL, "Item Respawn Delay", &cv_itemrespawntime, 58}, - {IT_STRING | IT_CVAR, NULL, "Player respawn delay", &cv_respawntime, 74}, + {IT_STRING | IT_CVAR, NULL, "Player Respawn Delay", &cv_respawntime, 74}, {IT_STRING | IT_CVAR, NULL, "Force Skin #", &cv_forceskin, 90}, - {IT_STRING | IT_CVAR, NULL, "Restrict skin changes", &cv_restrictskinchange, 98}, + {IT_STRING | IT_CVAR, NULL, "Restrict Skin Changes", &cv_restrictskinchange, 98}, //{IT_STRING | IT_CVAR, NULL, "Autobalance Teams", &cv_autobalance, 114}, //{IT_STRING | IT_CVAR, NULL, "Scramble Teams on Map Change", &cv_scrambleonchange, 122}, diff --git a/src/p_mobj.c b/src/p_mobj.c index d7ad596be..b7f2946bd 100644 --- a/src/p_mobj.c +++ b/src/p_mobj.c @@ -9279,7 +9279,7 @@ void P_RemoveSavegameMobj(mobj_t *mobj) } static CV_PossibleValue_t respawnitemtime_cons_t[] = {{1, "MIN"}, {300, "MAX"}, {0, NULL}}; -consvar_t cv_itemrespawntime = {"respawnitemtime", "1", CV_NETVAR|CV_CHEAT, respawnitemtime_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL}; +consvar_t cv_itemrespawntime = {"respawnitemtime", "3", CV_NETVAR|CV_CHEAT, respawnitemtime_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL}; consvar_t cv_itemrespawn = {"respawnitem", "On", CV_NETVAR, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL}; static CV_PossibleValue_t flagtime_cons_t[] = {{0, "MIN"}, {300, "MAX"}, {0, NULL}}; consvar_t cv_flagtime = {"flagtime", "30", CV_NETVAR|CV_CHEAT, flagtime_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL}; @@ -9514,9 +9514,13 @@ void P_RespawnSpecials(void) { P_SpawnMapThing(box->spawnpoint); newmobj = box->spawnpoint->mobj; // this is set to the new mobj in P_SpawnMapThing + P_SpawnMobj(box->spawnpoint->mobj->x, box->spawnpoint->mobj->y, box->spawnpoint->mobj->z, MT_EXPLODE); // poof into existance } else + { newmobj = P_SpawnMobj(box->x, box->y, box->z, box->type); + P_SpawnMobj(newmobj->x, newmobj->y, newmobj->z, MT_EXPLODE); // poof into existance + } // Transfer flags2 (strongbox, objectflip) newmobj->flags2 = box->flags2;