From 174921c1e1b897d3474434018c923de65a67b7ce Mon Sep 17 00:00:00 2001
From: toasterbabe <rollerorbital@gmail.com>
Date: Fri, 14 Apr 2017 20:46:48 +0100
Subject: [PATCH] End to sudden death.
---
src/d_netcmd.c | 1 -
src/d_netcmd.h | 1 -
src/m_menu.c | 1 -
src/p_inter.c | 8 --------
src/p_mobj.c | 1 -
5 files changed, 12 deletions(-)
diff --git a/src/d_netcmd.c b/src/d_netcmd.c
index 43f04bae30..4c7f78225f 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 08fc8b831a..fc72c8bf16 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 70388d40b0..d7e3b6229a 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 f5255a2f7d..04118a3789 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 520f9ad07d..9216bc7d00 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)
{
--
GitLab