From 04c2e47a5fa9bd73c10a78d39977fefaf6ab4303 Mon Sep 17 00:00:00 2001 From: Nicholas Hastings Date: Tue, 20 Jul 2010 11:21:37 -0400 Subject: [PATCH] Updated TF2 conditions enum and defines (bug 4526, r=fyren) --- plugins/include/tf2.inc | 6 ++++-- plugins/include/tf2_stocks.inc | 7 ++++--- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/plugins/include/tf2.inc b/plugins/include/tf2.inc index 4b567424..03910768 100644 --- a/plugins/include/tf2.inc +++ b/plugins/include/tf2.inc @@ -94,9 +94,11 @@ enum TFCond TFCond_DemoBuff, TFCond_CritCola, TFCond_Healing, - TFCond_OnFire, + + TFCond_OnFire = 22, TFCond_Overhealed, - TFCond_Jarated + TFCond_Jarated, + TFCond_Bleeding }; enum TFHoliday diff --git a/plugins/include/tf2_stocks.inc b/plugins/include/tf2_stocks.inc index cfa13c8b..f171bf9f 100644 --- a/plugins/include/tf2_stocks.inc +++ b/plugins/include/tf2_stocks.inc @@ -58,9 +58,10 @@ #define TF_CONDFLAG_DEMOBUFF (1 << 18) #define TF_CONDFLAG_CRITCOLA (1 << 19) #define TF_CONDFLAG_HEALING (1 << 20) -#define TF_CONDFLAG_ONFIRE (1 << 21) -#define TF_CONDFLAG_OVERHEALED (1 << 22) -#define TF_CONDFLAG_JARATED (1 << 23) +#define TF_CONDFLAG_ONFIRE (1 << 22) +#define TF_CONDFLAG_OVERHEALED (1 << 23) +#define TF_CONDFLAG_JARATED (1 << 24) +#define TF_CONDFLAG_BLEEDING (1 << 25) #define TF_DEATHFLAG_KILLERDOMINATION (1 << 0) #define TF_DEATHFLAG_ASSISTERDOMINATION (1 << 1)