From ee34b06605d6a93c5a88b47deabd4ab3bb11ab0d Mon Sep 17 00:00:00 2001
From: Alejo <53284952+aleeperezz16@users.noreply.github.com>
Date: Tue, 5 Sep 2023 01:10:38 -0300
Subject: [PATCH] New CVar: `mp_team_flash` (#693)

* Added new CVar `mp_team_flash`
---
 README.md                 |  1 +
 dist/game.cfg             |  8 ++++++++
 regamedll/dlls/combat.cpp | 13 +++++++++++++
 regamedll/dlls/game.cpp   |  2 ++
 regamedll/dlls/game.h     |  1 +
 5 files changed, 25 insertions(+)

diff --git a/README.md b/README.md
index ecda65025..5d521515e 100644
--- a/README.md
+++ b/README.md
@@ -100,6 +100,7 @@ This means that plugins that do binary code analysis (Orpheu for example) probab
 | mp_give_player_c4                  | 1       | 0   | 1            | Whether this map should spawn a C4 bomb for a player or not.<br/> `0` disabled<br/>`1` enabled |
 | mp_weapons_allow_map_placed        | 1       | 0   | 1            | When set, map weapons (located on the floor by map) will be shown.<br/> `0` hide all map weapons.<br/>`1` enabled<br/>`NOTE`: Effect will work after round restart. |
 | mp_free_armor                      | 0       | 0   | 2            | Give free armor on player spawn.<br/>`0` disabled <br/>`1` Give Kevlar <br/>`2` Give Kevlar + Helmet |
+| mp_team_flash                      | 1       | -1  | 1            | Sets the behaviour for Flashbangs on teammates.<br/>`-1` Don't affect teammates neither flash owner <br/>`0` Don't affect teammates <br/>`1` Affects teammates |
 | mp_fadetoblack                     | 0       | 0   | 2            | Observer's screen will fade to black on kill event or permanent.<br/> `0` No fade.<br/>`1` Fade to black and won't be able to watch anybody.<br/>`2` fade to black only on kill moment. |
 | mp_falldamage                      | 1       | 0   | 1            | Damage from falling.<br/>`0` disabled <br/>`1` enabled |
 | sv_allchat                         | 1       | 0   | 1            | Players can receive all other players text chat, team restrictions apply<br/>`0` disabled <br/>`1` enabled |
diff --git a/dist/game.cfg b/dist/game.cfg
index 76b28aa78..fece0de56 100644
--- a/dist/game.cfg
+++ b/dist/game.cfg
@@ -474,6 +474,14 @@ mp_ct_default_weapons_secondary "usp"
 // Default value: "0"
 mp_free_armor "0"
 
+// Sets the behaviour for Flashbangs on teammates.
+// -1 - Don't affect teammates neither flash owner
+// 0  - Don't affect teammates
+// 1  - Affects teammates (default behaviour)
+//
+// Default value: "1"
+mp_team_flash 1
+
 // Players can receive all other players text chat, team restrictions apply.
 // 0 - disabled (default behaviour)
 // 1 - enabled
diff --git a/regamedll/dlls/combat.cpp b/regamedll/dlls/combat.cpp
index 390c8d613..5e69f213c 100644
--- a/regamedll/dlls/combat.cpp
+++ b/regamedll/dlls/combat.cpp
@@ -90,6 +90,19 @@ void RadiusFlash(Vector vecSrc, entvars_t *pevInflictor, entvars_t *pevAttacker,
 
 		if (tr2.flFraction >= 1.0)
 		{
+#ifdef REGAMEDLL_ADD
+			switch ((int)teamflash.value)
+			{
+			case 0:
+				if (pPlayer->pev != pevAttacker && g_pGameRules->PlayerRelationship(pPlayer, CBaseEntity::Instance(pevAttacker)) == GR_TEAMMATE)
+					continue;
+				break;
+			case -1:
+				if (pPlayer->pev == pevAttacker || g_pGameRules->PlayerRelationship(pPlayer, CBaseEntity::Instance(pevAttacker)) == GR_TEAMMATE)
+					continue;
+				break;
+			}		
+#endif
 			if (tr.fStartSolid)
 			{
 				tr.vecEndPos = vecSrc;
diff --git a/regamedll/dlls/game.cpp b/regamedll/dlls/game.cpp
index 237a8f515..34d9d0ad6 100644
--- a/regamedll/dlls/game.cpp
+++ b/regamedll/dlls/game.cpp
@@ -160,6 +160,7 @@ cvar_t t_give_player_knife               = { "mp_t_give_player_knife", "1", 0, 1
 cvar_t t_default_weapons_secondary       = { "mp_t_default_weapons_secondary", "glock18", 0, 0.0f, nullptr };
 cvar_t t_default_weapons_primary         = { "mp_t_default_weapons_primary", "", 0, 0.0f, nullptr };
 cvar_t free_armor                        = { "mp_free_armor", "0", 0, 0.0f, nullptr };
+cvar_t teamflash                         = { "mp_team_flash", "1", 0, 1.0f, nullptr };
 cvar_t allchat                           = { "sv_allchat", "0", 0, 0.0f, nullptr };
 cvar_t sv_autobunnyhopping               = { "sv_autobunnyhopping", "0", 0, 0.0f, nullptr };
 cvar_t sv_enablebunnyhopping             = { "sv_enablebunnyhopping", "0", 0, 0.0f, nullptr };
@@ -410,6 +411,7 @@ void EXT_FUNC GameDLLInit()
 	CVAR_REGISTER(&t_default_weapons_secondary);
 	CVAR_REGISTER(&t_default_weapons_primary);
 	CVAR_REGISTER(&free_armor);
+	CVAR_REGISTER(&teamflash);
 	CVAR_REGISTER(&allchat);
 	CVAR_REGISTER(&sv_autobunnyhopping);
 	CVAR_REGISTER(&sv_enablebunnyhopping);
diff --git a/regamedll/dlls/game.h b/regamedll/dlls/game.h
index 18ae0fdb9..bb9d9c1ca 100644
--- a/regamedll/dlls/game.h
+++ b/regamedll/dlls/game.h
@@ -186,6 +186,7 @@ extern cvar_t t_give_player_knife;
 extern cvar_t t_default_weapons_secondary;
 extern cvar_t t_default_weapons_primary;
 extern cvar_t free_armor;
+extern cvar_t teamflash;
 extern cvar_t allchat;
 extern cvar_t sv_autobunnyhopping;
 extern cvar_t sv_enablebunnyhopping;