From b1943df57af57eaaf5db9b6dcd0b43740fcd4f7a Mon Sep 17 00:00:00 2001 From: Marco Cawthorne Date: Sat, 16 Jul 2022 15:09:18 -0700 Subject: [PATCH] Cleanup: Some CGameRules methods are now of type 'bool' Remove rules.qc --- src/server/gamerules.qc | 3 --- src/server/gamerules_multiplayer.qc | 16 ++++++++++++++-- src/server/progs.src | 1 - 3 files changed, 14 insertions(+), 6 deletions(-) mode change 100755 => 100644 src/server/progs.src diff --git a/src/server/gamerules.qc b/src/server/gamerules.qc index e318d37..1140942 100644 --- a/src/server/gamerules.qc +++ b/src/server/gamerules.qc @@ -14,9 +14,6 @@ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -var int autocvar_sv_playerkeepalive = TRUE; - - bool HLGameRules::IsMultiplayer(void) { diff --git a/src/server/gamerules_multiplayer.qc b/src/server/gamerules_multiplayer.qc index 85f4209..b95539f 100644 --- a/src/server/gamerules_multiplayer.qc +++ b/src/server/gamerules_multiplayer.qc @@ -20,6 +20,18 @@ HLMultiplayerRules::IsMultiplayer(void) return true; } +bool +HLMultiplayerRules::IsTeamplay(void) +{ + return false; +} + +void +HLMultiplayerRules::InitPostEnts(void) +{ + +} + void HLMultiplayerRules::FrameStart(void) { @@ -153,7 +165,7 @@ HLMultiplayerRules::PlayerSpawn(NSClientPlayer pp) Client_FixAngle(pl, pl.angles); } -float +bool HLMultiplayerRules::ConsoleCommand(NSClientPlayer pp, string cmd) { tokenize(cmd); @@ -169,7 +181,7 @@ HLMultiplayerRules::ConsoleCommand(NSClientPlayer pp, string cmd) return (1); } -int +bool HLMultiplayerRules::MonstersSpawn(void) { return (FALSE); diff --git a/src/server/progs.src b/src/server/progs.src old mode 100755 new mode 100644 index 933f2b4..dddba53 --- a/src/server/progs.src +++ b/src/server/progs.src @@ -41,7 +41,6 @@ gamerules_multiplayer.qc ../../../valve/src/server/client.qc ../../../valve/src/server/server.qc ../../../base/src/server/damage.qc -../../../valve/src/server/rules.qc ../../../valve/src/server/flashlight.qc ../../../base/src/server/modelevent.qc