From 85b71aa6858d79d3dcd405ead255108cf5288eee Mon Sep 17 00:00:00 2001
From: toasterbabe <rollerorbital@gmail.com>
Date: Fri, 14 Apr 2017 20:51:25 +0100
Subject: [PATCH] End to old match scoring toggle.
---
src/d_netcmd.c | 3 ---
src/d_netcmd.h | 1 -
src/m_menu.c | 11 ++++-------
src/p_inter.c | 4 ++--
4 files changed, 6 insertions(+), 13 deletions(-)
diff --git a/src/d_netcmd.c b/src/d_netcmd.c
index 4c7f78225f..6af6fa6e21 100644
--- a/src/d_netcmd.c
+++ b/src/d_netcmd.c
@@ -196,7 +196,6 @@ static CV_PossibleValue_t matchboxes_cons_t[] = {{0, "Normal"}, {1, "Random"}, {
{3, "None"}, {0, NULL}};
static CV_PossibleValue_t chances_cons_t[] = {{0, "MIN"}, {9, "MAX"}, {0, NULL}};
-static CV_PossibleValue_t match_scoring_cons_t[] = {{0, "Normal"}, {1, "Classic"}, {0, NULL}};
static CV_PossibleValue_t pause_cons_t[] = {{0, "Server"}, {1, "All"}, {0, NULL}};
static CV_PossibleValue_t timetic_cons_t[] = {{0, "Normal"}, {1, "Tics"}, {2, "Centiseconds"}, {0, NULL}};
@@ -311,7 +310,6 @@ consvar_t cv_friendlyfire = {"friendlyfire", "Off", CV_NETVAR, CV_OnOff, NULL, 0
consvar_t cv_itemfinder = {"itemfinder", "Off", CV_CALL, CV_OnOff, ItemFinder_OnChange, 0, NULL, NULL, 0, 0, NULL};
// Scoring type options
-consvar_t cv_match_scoring = {"matchscoring", "Normal", CV_NETVAR|CV_CHEAT, match_scoring_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
consvar_t cv_overtime = {"overtime", "Yes", CV_NETVAR, CV_YesNo, NULL, 0, NULL, NULL, 0, 0, NULL};
consvar_t cv_rollingdemos = {"rollingdemos", "On", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
@@ -532,7 +530,6 @@ void D_RegisterServerCommands(void)
CV_RegisterVar(&cv_startinglives);
CV_RegisterVar(&cv_countdowntime);
CV_RegisterVar(&cv_runscripts);
- CV_RegisterVar(&cv_match_scoring);
CV_RegisterVar(&cv_overtime);
CV_RegisterVar(&cv_pause);
CV_RegisterVar(&cv_mute);
diff --git a/src/d_netcmd.h b/src/d_netcmd.h
index fc72c8bf16..9b148ce5f5 100644
--- a/src/d_netcmd.h
+++ b/src/d_netcmd.h
@@ -100,7 +100,6 @@ extern consvar_t cv_recycler;
extern consvar_t cv_itemfinder;
extern consvar_t cv_inttime, cv_advancemap, cv_playersforexit;
-extern consvar_t cv_match_scoring;
extern consvar_t cv_overtime;
extern consvar_t cv_startinglives;
diff --git a/src/m_menu.c b/src/m_menu.c
index d7e3b6229a..8a9d2327bd 100644
--- a/src/m_menu.c
+++ b/src/m_menu.c
@@ -1394,14 +1394,11 @@ static menuitem_t OP_GametypeOptionsMenu[] =
{IT_STRING | IT_CVAR, NULL, "Number of Laps", &cv_numlaps, 74},
{IT_STRING | IT_CVAR, NULL, "Use Map Lap Counts", &cv_usemapnumlaps, 82},
- {IT_HEADER, NULL, "MATCH", NULL, 98},
- {IT_STRING | IT_CVAR, NULL, "Scoring Type", &cv_match_scoring, 106},
+ {IT_HEADER, NULL, "TAG", NULL, 98},
+ {IT_STRING | IT_CVAR, NULL, "Hide Time", &cv_hidetime, 106},
- {IT_HEADER, NULL, "TAG", NULL, 122},
- {IT_STRING | IT_CVAR, NULL, "Hide Time", &cv_hidetime, 130},
-
- {IT_HEADER, NULL, "CTF", NULL, 146},
- {IT_STRING | IT_CVAR, NULL, "Flag Respawn Time", &cv_flagtime, 154},
+ {IT_HEADER, NULL, "CTF", NULL, 122},
+ {IT_STRING | IT_CVAR, NULL, "Flag Respawn Time", &cv_flagtime, 130},
};
static menuitem_t OP_MonitorToggleMenu[] =
diff --git a/src/p_inter.c b/src/p_inter.c
index 04118a3789..ff3718e67c 100644
--- a/src/p_inter.c
+++ b/src/p_inter.c
@@ -2097,7 +2097,7 @@ void P_KillMobj(mobj_t *target, mobj_t *inflictor, mobj_t *source, UINT8 damaget
{
if (metalrecording) // Ack! Metal Sonic shouldn't die! Cut the tape, end recording!
G_StopMetalRecording();
- if (gametype == GT_MATCH && cv_match_scoring.value == 0 // note, no team match suicide penalty
+ if (gametype == GT_MATCH // note, no team match suicide penalty
&& ((target == source) || (source == NULL && inflictor == NULL) || (source && !source->player)))
{ // Suicide penalty
if (target->player->score >= 50)
@@ -2887,7 +2887,7 @@ static void P_ShieldDamage(player_t *player, mobj_t *inflictor, mobj_t *source,
{
// Award no points when players shoot each other when cv_friendlyfire is on.
if (!G_GametypeHasTeams() || !(source->player->ctfteam == player->ctfteam && source != player->mo))
- P_AddPlayerScore(source->player, cv_match_scoring.value == 1 ? 25 : 50);
+ P_AddPlayerScore(source->player, 50);
}
}
--
GitLab