From fc528717393d4cb104ab593175c9c5df0813514e Mon Sep 17 00:00:00 2001
From: Vaqtincha <51029683+Vaqtincha@users.noreply.github.com>
Date: Mon, 12 Apr 2021 17:55:03 +0500
Subject: [PATCH] Refactoring (#540)

* Rename CMD mp_swapteams
* Remove unused CVar mp_mirrordamage
* Refactoring checks
---
 README.md                              | 2 +-
 regamedll/dlls/game.cpp                | 6 +++++-
 regamedll/dlls/multiplay_gamerules.cpp | 3 +--
 regamedll/dlls/player.cpp              | 6 +++---
 4 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/README.md b/README.md
index 7222ef2c..37f44c15 100644
--- a/README.md
+++ b/README.md
@@ -27,7 +27,7 @@ Archive's bin directory contains 2 subdirectories, 'bugfixed' and 'pure'
 | :---------------------------------- | :---------------------------------------------- |
 | game version                        | Will show GameDLL build version, date & URL. |
 | endround                            | Args:<br/>`T` force round end with Terrorists win. <br/>`CT` force round end with Counter-Terrorists win. <br/> or terminate round draw when called without arguments. |
-| mp_swapteams                        | Swap the teams and restart the game. |
+| swapteams                           | Swap the teams and restart the game. |
 
 ## Configuration (cvars)
 <details>
diff --git a/regamedll/dlls/game.cpp b/regamedll/dlls/game.cpp
index d0f43e62..f93345a9 100644
--- a/regamedll/dlls/game.cpp
+++ b/regamedll/dlls/game.cpp
@@ -243,7 +243,11 @@ void EXT_FUNC GameDLLInit()
 	CVAR_REGISTER(&autoteambalance);
 	CVAR_REGISTER(&tkpunish);
 	CVAR_REGISTER(&hostagepenalty);
+
+#ifndef REGAMEDLL_FIXES
 	CVAR_REGISTER(&mirrordamage);
+#endif
+
 	CVAR_REGISTER(&logmessages);
 	CVAR_REGISTER(&forcecamera);
 	CVAR_REGISTER(&forcechasecam);
@@ -320,7 +324,7 @@ void EXT_FUNC GameDLLInit()
 
 	ADD_SERVER_COMMAND("game", GameDLL_Version_f);
 	ADD_SERVER_COMMAND("endround", GameDLL_EndRound_f);
-	ADD_SERVER_COMMAND("mp_swapteams", GameDLL_SwapTeams_f);
+	ADD_SERVER_COMMAND("swapteams", GameDLL_SwapTeams_f);
 
 	CVAR_REGISTER(&game_version);
 	CVAR_REGISTER(&maxmoney);
diff --git a/regamedll/dlls/multiplay_gamerules.cpp b/regamedll/dlls/multiplay_gamerules.cpp
index a34fe6d2..c4a97257 100644
--- a/regamedll/dlls/multiplay_gamerules.cpp
+++ b/regamedll/dlls/multiplay_gamerules.cpp
@@ -3910,9 +3910,8 @@ void EXT_FUNC CHalfLifeMultiplay::__API_HOOK(PlayerKilled)(CBasePlayer *pVictim,
 	{
 		// if a player dies in a deathmatch game and the killer is a client, award the killer some points
 		CBasePlayer *killer = GetClassPtr<CCSPlayer>((CBasePlayer *)pKiller);
-		bool killedByFFA = IsFreeForAll();
 
-		if (killer->m_iTeam == pVictim->m_iTeam && !killedByFFA)
+		if (g_pGameRules->PlayerRelationship(pVictim, killer) == GR_TEAMMATE)
 		{
 			// if a player dies by from teammate
 			pKiller->frags -= IPointsForKill(peKiller, pVictim);
diff --git a/regamedll/dlls/player.cpp b/regamedll/dlls/player.cpp
index c63f81bf..f1591926 100644
--- a/regamedll/dlls/player.cpp
+++ b/regamedll/dlls/player.cpp
@@ -835,7 +835,7 @@ BOOL EXT_FUNC CBasePlayer::__API_HOOK(TakeDamage)(entvars_t *pevInflictor, entva
 		CBaseEntity *pAttacker = GET_PRIVATE<CBaseEntity>(ENT(pevAttacker));
 
 		// don't take damage if victim has protection
-		if (((pAttacker && pAttacker->IsPlayer()) || (bitsDamageType & DMG_FALL))  && CSPlayer()->GetProtectionState() == CCSPlayer::ProtectionSt_Active)
+		if (((pAttacker && pAttacker->IsPlayer()) || (bitsDamageType & DMG_FALL)) && CSPlayer()->GetProtectionState() == CCSPlayer::ProtectionSt_Active)
 			return FALSE;
 	}
 #endif
@@ -1034,7 +1034,7 @@ BOOL EXT_FUNC CBasePlayer::__API_HOOK(TakeDamage)(entvars_t *pevInflictor, entva
 		pAttack = GetClassPtr<CCSPlayer>((CBasePlayer *)pevAttacker);
 
 		// warn about team attacks
-		if (!CSGameRules()->IsFreeForAll() && pAttack->m_iTeam == m_iTeam)
+		if (g_pGameRules->PlayerRelationship(this, pAttack) == GR_TEAMMATE)
 		{
 			if (pAttack != this)
 			{
@@ -7748,7 +7748,7 @@ void CBasePlayer::UpdateStatusBar()
 			{
 				CBasePlayer *pTarget = (CBasePlayer *)pEntity;
 
-				bool sameTeam = !CSGameRules()->IsFreeForAll() && pTarget->m_iTeam == m_iTeam;
+				bool sameTeam = g_pGameRules->PlayerRelationship(this, pTarget) == GR_TEAMMATE;
 
 				newSBarState[SBAR_ID_TARGETNAME] = ENTINDEX(pTarget->edict());
 				newSBarState[SBAR_ID_TARGETTYPE] = sameTeam ? SBAR_TARGETTYPE_TEAMMATE : SBAR_TARGETTYPE_ENEMY;