From ab1586cc7368c885eb227b6d5447eeb06a8942a2 Mon Sep 17 00:00:00 2001 From: terencehill Date: Mon, 28 Jan 2019 18:38:39 +0100 Subject: [PATCH] Remove 2 unnecessary macros --- qcsrc/common/gamemodes/gamemode/clanarena/sv_clanarena.qc | 3 +-- qcsrc/common/gamemodes/gamemode/freezetag/sv_freezetag.qc | 4 +--- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/qcsrc/common/gamemodes/gamemode/clanarena/sv_clanarena.qc b/qcsrc/common/gamemodes/gamemode/clanarena/sv_clanarena.qc index cdcb0d0d0f..163b996c3f 100644 --- a/qcsrc/common/gamemodes/gamemode/clanarena/sv_clanarena.qc +++ b/qcsrc/common/gamemodes/gamemode/clanarena/sv_clanarena.qc @@ -62,7 +62,6 @@ int CA_GetWinnerTeam() void nades_Clear(entity player); -#define CA_ALIVE_TEAMS_OK() (Team_GetNumberOfAliveTeams() == NumTeams(ca_teams)) float CA_CheckWinner() { if(round_handler_GetEndTime() > 0 && round_handler_GetEndTime() - time <= 0) @@ -115,7 +114,7 @@ bool CA_CheckTeams() static int prev_missing_teams_mask; allowed_to_spawn = true; CA_count_alive_players(); - if(CA_ALIVE_TEAMS_OK()) + if (Team_GetNumberOfAliveTeams() == NumTeams(ca_teams)) { if(prev_missing_teams_mask > 0) Kill_Notification(NOTIF_ALL, NULL, MSG_CENTER, CPID_MISSING_TEAMS); diff --git a/qcsrc/common/gamemodes/gamemode/freezetag/sv_freezetag.qc b/qcsrc/common/gamemodes/gamemode/freezetag/sv_freezetag.qc index bb9784d022..11c55d6679 100644 --- a/qcsrc/common/gamemodes/gamemode/freezetag/sv_freezetag.qc +++ b/qcsrc/common/gamemodes/gamemode/freezetag/sv_freezetag.qc @@ -43,12 +43,10 @@ void freezetag_count_alive_players() eliminatedPlayers.SendFlags |= 1; } -#define FREEZETAG_ALIVE_TEAMS_OK() (Team_GetNumberOfAliveTeams() == NumTeams(freezetag_teams)) - bool freezetag_CheckTeams() { static float prev_missing_teams_mask; - if(FREEZETAG_ALIVE_TEAMS_OK()) + if (Team_GetNumberOfAliveTeams() == NumTeams(freezetag_teams)) { if(prev_missing_teams_mask > 0) Kill_Notification(NOTIF_ALL, NULL, MSG_CENTER, CPID_MISSING_TEAMS); -- 2.39.2