From 3e3439e10e0f0a3fd62bb94217f4d0d1ff3da118 Mon Sep 17 00:00:00 2001 From: Marco Cawthorne Date: Sat, 16 Jul 2022 15:09:58 -0700 Subject: [PATCH] Cleanup: Some CGameRules methods are now of type 'bool' Remove rules.qc --- src/client/scoreboard.qc | 2 +- src/server/gamerules.h | 2 +- src/server/progs.src | 1 - src/server/rules.qc | 20 -------------------- 4 files changed, 2 insertions(+), 23 deletions(-) delete mode 100644 src/server/rules.qc diff --git a/src/client/scoreboard.qc b/src/client/scoreboard.qc index 3006beb..17702c0 100644 --- a/src/client/scoreboard.qc +++ b/src/client/scoreboard.qc @@ -181,7 +181,7 @@ Scores_Draw(void) pos = video_mins + [(video_res[0] / 2) - 145, 30]; } - if (Util_IsTeamPlay()) { + if (Util_IsTeamplay()) { Scores_DrawTeam(pl, pos); } else { Scores_DrawNormal(pl, pos); diff --git a/src/server/gamerules.h b/src/server/gamerules.h index 6f6198b..bfa6a82 100644 --- a/src/server/gamerules.h +++ b/src/server/gamerules.h @@ -97,7 +97,7 @@ class TSMultiplayerRules:TSGameRules virtual void(NSClientPlayer) PlayerPreFrame; virtual void(NSClientPlayer) PlayerPostFrame; virtual void(NSClientPlayer) PlayerDeath; - virtual float(NSClientPlayer, string) ConsoleCommand; + virtual bool(NSClientPlayer, string) ConsoleCommand; virtual void(float, int) TimerBegin; virtual void(void) TimerUpdate; diff --git a/src/server/progs.src b/src/server/progs.src index 7f21f05..7e9f573 100644 --- a/src/server/progs.src +++ b/src/server/progs.src @@ -137,7 +137,6 @@ init.qc //../../../base/src/server/damage.qc damage.qc -rules.qc ../../../base/src/server/modelevent.qc spawn.qc diff --git a/src/server/rules.qc b/src/server/rules.qc deleted file mode 100644 index adbb741..0000000 --- a/src/server/rules.qc +++ /dev/null @@ -1,20 +0,0 @@ -/* - * Copyright (c) 2016-2020 Marco Cawthorne - * - * Permission to use, copy, modify, and distribute this software for any - * purpose with or without fee is hereby granted, provided that the above - * copyright notice and this permission notice appear in all copies. - * - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES - * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR - * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES - * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER - * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING - * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ - -int Rules_IsTeamPlay(void) -{ - return cvar("teamplay"); -}