From fd062308fe2252606ea97ca7df2feb0e4d1ec399 Mon Sep 17 00:00:00 2001
From: Jaime Passos <lazymyuutsu@gmail.com>
Date: Fri, 28 Feb 2020 23:41:10 -0300
Subject: [PATCH] Score adding and stealing should check the gametype's rules.
---
src/p_user.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/p_user.c b/src/p_user.c
index 83f69a4d9d..f9dbd58235 100644
--- a/src/p_user.c
+++ b/src/p_user.c
@@ -1437,7 +1437,7 @@ void P_AddPlayerScore(player_t *player, UINT32 amount)
}
// In team match, all awarded points are incremented to the team's running score.
- if (gametype == GT_TEAMMATCH)
+ if ((gametyperules & (GTR_TEAMS|GTR_TEAMFLAGS)) == GTR_TEAMS)
{
if (player->ctfteam == 1)
redscore += amount;
@@ -1471,7 +1471,7 @@ void P_StealPlayerScore(player_t *player, UINT32 amount)
if (stolen > 0)
{
// In team match, all stolen points are removed from the enemy team's running score.
- if (gametype == GT_TEAMMATCH)
+ if ((gametyperules & (GTR_TEAMS|GTR_TEAMFLAGS)) == GTR_TEAMS)
{
if (player->ctfteam == 1)
bluescore -= amount;
--
GitLab