From 169bd80fc88c7ade3f526eff90e783a8dcd837e3 Mon Sep 17 00:00:00 2001
From: Marco Hladik <marco@icculus.org>
Date: Wed, 2 Mar 2022 09:14:58 -0800
Subject: [PATCH] GameRules: Add 'IsTeamPlay()' method to the gamerules class.
 Use this instead of the soon to be removed Rules_IsTeamPlay()!

---
 src/server/gamerules.h  | 2 ++
 src/server/gamerules.qc | 9 +++++++++
 2 files changed, 11 insertions(+)

diff --git a/src/server/gamerules.h b/src/server/gamerules.h
index 54322540..2a458bee 100644
--- a/src/server/gamerules.h
+++ b/src/server/gamerules.h
@@ -54,6 +54,8 @@ class CGameRules
 	virtual void(void) IntermissionCycle;
 	virtual void(void) IntermissionEnd;
 
+	virtual float(void) IsTeamPlay;
+
 	/* spectator */
 	/*virtual void(base_player) SpectatorConnect;
 	virtual void(base_player) SpectatorDisconnect;
diff --git a/src/server/gamerules.qc b/src/server/gamerules.qc
index 5efac851..14a3fd8c 100644
--- a/src/server/gamerules.qc
+++ b/src/server/gamerules.qc
@@ -53,11 +53,13 @@ void
 CGameRules::PlayerDeath(base_player pl)
 {
 	//print("PlayerDeath!\n");
+	pl.Death();
 }
 void
 CGameRules::PlayerPain(base_player pl)
 {
 	//print("ClientKill!\n");
+	pl.Pain();
 }
 void
 CGameRules::PlayerSpawn(base_player pl)
@@ -177,6 +179,13 @@ CGameRules::MonstersSpawn(void)
 	return (TRUE);
 }
 
+/* init */
+float
+CGameRules::IsTeamPlay(void)
+{
+	return (FALSE);
+}
+
 void
 CGameRules::DamageApply(entity t, entity c, float dmg, int w, damageType_t type)
 {