From 2a7357beac768f93d7d80e320982c203c0412728 Mon Sep 17 00:00:00 2001 From: Samual Lenks Date: Fri, 8 Feb 2013 01:48:28 -0500 Subject: [PATCH] Get rid of TEAM_SV_TO_CL and TEAM_CL_TO_SV aliases --- qcsrc/common/notifications.qh | 2 +- qcsrc/common/teams.qh | 8 -------- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/qcsrc/common/notifications.qh b/qcsrc/common/notifications.qh index 6c89e18e6..bbd3e4642 100644 --- a/qcsrc/common/notifications.qh +++ b/qcsrc/common/notifications.qh @@ -95,7 +95,7 @@ string got_commandkey; #define SPREE_INF (((f1 == 3) || (f1 == 5) || (f1 == 10) || (f1 == 15) || (f1 == 20) || (f1 == 25) || (f1 == 30)) ? sprintf(normal_or_gentle(_("%d frag spree! "), _("%d score spree! ")), f1) : "") #define SPREE_END ((f1 >= 3) ? sprintf(normal_or_gentle(_(", ending their %d frag spree"), _(", ending their %d score spree")), f1) : "") #define SPREE_LOST ((f1 >= 3) ? sprintf(normal_or_gentle(_(", losing their %d frag spree"), _(", losing their %d score spree")), f1) : "") -#define DEATH_TEAM Team_ColoredFullName(TEAM_SV_TO_CL(f1)) +#define DEATH_TEAM Team_ColoredFullName(f1 - 1) #define WEAPON_NAME f1 // weaponorder[f1].netname #else // SVQC replacements diff --git a/qcsrc/common/teams.qh b/qcsrc/common/teams.qh index 95f8f2006..00500a161 100644 --- a/qcsrc/common/teams.qh +++ b/qcsrc/common/teams.qh @@ -4,10 +4,6 @@ const float FL_TEAM_2 = 2; // blue const float FL_TEAM_3 = 3; // yellow const float FL_TEAM_4 = 4; // pink const float FL_SPECTATOR = 5; - -// TO BE PHASED OUT IF WE SWITCH TO USE "TEAMNUMBERS_THAT_ARENT_STUPID" -#define TEAM_SV_TO_CL(num) num -#define TEAM_CL_TO_SV(num) num #else #ifdef CSQC const float FL_TEAM_1 = 4; // red @@ -21,10 +17,6 @@ const float FL_TEAM_3 = 13; // yellow const float FL_TEAM_4 = 10; // pink #endif const float FL_SPECTATOR = 1337; - -// TO BE PHASED OUT IF WE SWITCH TO USE "TEAMNUMBERS_THAT_ARENT_STUPID" -#define TEAM_SV_TO_CL(num) (num - 1) -#define TEAM_CL_TO_SV(num) (num + 1) #endif const string COL_TEAM_1 = "^1"; -- 2.39.2