diff --git a/src/d_netcmd.c b/src/d_netcmd.c index 43f04bae309771d54fbcae1e62ed79b0e635eada..4c7f78225f1eea918e890c20974816df917828ba 100644 --- a/src/d_netcmd.c +++ b/src/d_netcmd.c @@ -485,7 +485,6 @@ void D_RegisterServerCommands(void) CV_RegisterVar(&cv_itemrespawntime); CV_RegisterVar(&cv_itemrespawn); CV_RegisterVar(&cv_flagtime); - CV_RegisterVar(&cv_suddendeath); // misc CV_RegisterVar(&cv_friendlyfire); diff --git a/src/d_netcmd.h b/src/d_netcmd.h index 08fc8b831a507bb0d4662fc9d61e4141820322a6..fc72c8bf162e9312526a509d847af7d53fadcd60 100644 --- a/src/d_netcmd.h +++ b/src/d_netcmd.h @@ -51,7 +51,6 @@ extern consvar_t cv_itemrespawntime; extern consvar_t cv_itemrespawn; extern consvar_t cv_flagtime; -extern consvar_t cv_suddendeath; extern consvar_t cv_skin; diff --git a/src/m_menu.c b/src/m_menu.c index 70388d40b00d52d96d01d34be4a324adb2958231..d7e3b6229a13a5f2f907967ee14a621b20756cb0 100644 --- a/src/m_menu.c +++ b/src/m_menu.c @@ -1371,7 +1371,6 @@ static menuitem_t OP_NetgameOptionsMenu[] = {IT_STRING | IT_CVAR, NULL, "Item Respawn", &cv_itemrespawn, 66}, {IT_STRING | IT_CVAR, NULL, "Item Respawn time", &cv_itemrespawntime, 74}, - {IT_STRING | IT_CVAR, NULL, "Sudden Death", &cv_suddendeath, 90}, {IT_STRING | IT_CVAR, NULL, "Player respawn delay", &cv_respawntime, 98}, {IT_STRING | IT_CVAR, NULL, "Force Skin", &cv_forceskin, 114}, diff --git a/src/p_inter.c b/src/p_inter.c index f5255a2f7d1d74ebbdead3d6100dc4474a9bcffd..04118a3789b15aaad13dbd935543c7518c93d515 100644 --- a/src/p_inter.c +++ b/src/p_inter.c @@ -3120,14 +3120,6 @@ boolean P_DamageMobj(mobj_t *target, mobj_t *inflictor, mobj_t *source, INT32 da return false; // Don't get hurt by fire generated from friends. } - // Sudden-Death mode - if (source && source->type == MT_PLAYER) - { - if ((gametype == GT_MATCH || gametype == GT_TEAMMATCH || gametype == GT_CTF) && cv_suddendeath.value - && !player->powers[pw_flashing] && !player->powers[pw_invulnerability]) - damagetype = DMG_INSTAKILL; - } - // Player hits another player if (!force && source && source->player) { diff --git a/src/p_mobj.c b/src/p_mobj.c index 520f9ad07d45a1da1f4b102e9ad7886029861862..9216bc7d001eb4a0403c610d4d62194b05d930d5 100644 --- a/src/p_mobj.c +++ b/src/p_mobj.c @@ -8763,7 +8763,6 @@ consvar_t cv_itemrespawntime = {"respawnitemtime", "30", CV_NETVAR|CV_CHEAT, res 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}; -consvar_t cv_suddendeath = {"suddendeath", "Off", CV_NETVAR|CV_CHEAT, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL}; void P_SpawnPrecipitation(void) {