From 7b88d670d5b324e9488b33877a06bae3f2b32aa3 Mon Sep 17 00:00:00 2001 From: TehRealSalt Date: Tue, 24 Oct 2017 00:06:13 -0400 Subject: [PATCH] Respawn time is now Match-only --- src/p_inter.c | 7 ++++++- src/p_mobj.c | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/p_inter.c b/src/p_inter.c index 64c2ef94..d5847677 100644 --- a/src/p_inter.c +++ b/src/p_inter.c @@ -2091,7 +2091,12 @@ void P_KillMobj(mobj_t *target, mobj_t *inflictor, mobj_t *source) P_SetTarget(&target->target, source); source->player->numboxes++; if ((cv_itemrespawn.value && gametype != GT_COOP && (modifiedgame || netgame || multiplayer))) - target->fuse = cv_itemrespawntime.value*TICRATE + 2; // Random box generation + { + if (gametype == GT_RACE) + target->fuse = TICRATE + 2; + else + target->fuse = cv_itemrespawntime.value*TICRATE + 2; // Random box generation + } } // Award Score Tails diff --git a/src/p_mobj.c b/src/p_mobj.c index 279712f0..152f42fb 100644 --- a/src/p_mobj.c +++ b/src/p_mobj.c @@ -8799,7 +8799,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", "5", 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};