Updated TF2 conditions enum and defines (bug 4526, r=fyren)

This commit is contained in:
Nicholas Hastings 2010-07-20 11:21:37 -04:00
parent fbbf193345
commit 1507d03c21
2 changed files with 8 additions and 5 deletions

View File

@ -94,9 +94,11 @@ enum TFCond
TFCond_DemoBuff, TFCond_DemoBuff,
TFCond_CritCola, TFCond_CritCola,
TFCond_Healing, TFCond_Healing,
TFCond_OnFire,
TFCond_OnFire = 22,
TFCond_Overhealed, TFCond_Overhealed,
TFCond_Jarated TFCond_Jarated,
TFCond_Bleeding
}; };
enum TFHoliday enum TFHoliday

View File

@ -58,9 +58,10 @@
#define TF_CONDFLAG_DEMOBUFF (1 << 18) #define TF_CONDFLAG_DEMOBUFF (1 << 18)
#define TF_CONDFLAG_CRITCOLA (1 << 19) #define TF_CONDFLAG_CRITCOLA (1 << 19)
#define TF_CONDFLAG_HEALING (1 << 20) #define TF_CONDFLAG_HEALING (1 << 20)
#define TF_CONDFLAG_ONFIRE (1 << 21) #define TF_CONDFLAG_ONFIRE (1 << 22)
#define TF_CONDFLAG_OVERHEALED (1 << 22) #define TF_CONDFLAG_OVERHEALED (1 << 23)
#define TF_CONDFLAG_JARATED (1 << 23) #define TF_CONDFLAG_JARATED (1 << 24)
#define TF_CONDFLAG_BLEEDING (1 << 25)
#define TF_DEATHFLAG_KILLERDOMINATION (1 << 0) #define TF_DEATHFLAG_KILLERDOMINATION (1 << 0)
#define TF_DEATHFLAG_ASSISTERDOMINATION (1 << 1) #define TF_DEATHFLAG_ASSISTERDOMINATION (1 << 1)