From 4d319c12f81b63627fe7043d817fbf797752a569 Mon Sep 17 00:00:00 2001 From: Nicholas Hastings Date: Sat, 18 Dec 2010 17:07:42 -0500 Subject: [PATCH] Updated TF2 includes with new weapon and condition identifiers (bug 4761, r=fyren). --- plugins/include/tf2.inc | 3 ++- plugins/include/tf2_stocks.inc | 5 ++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/plugins/include/tf2.inc b/plugins/include/tf2.inc index 7944d830..b3cfcd82 100644 --- a/plugins/include/tf2.inc +++ b/plugins/include/tf2.inc @@ -82,7 +82,8 @@ enum TFCond TFCond_TeleportedGlow, TFCond_Taunting, TFCond_UberchargeFading, - TFCond_Unknown1, + TFCond_Unknown1, //9 + TFCond_CloakFlicker = 9, TFCond_Teleporting, TFCond_Kritzkrieged, TFCond_Unknown2, diff --git a/plugins/include/tf2_stocks.inc b/plugins/include/tf2_stocks.inc index 477bb978..8e2a00a5 100644 --- a/plugins/include/tf2_stocks.inc +++ b/plugins/include/tf2_stocks.inc @@ -48,6 +48,7 @@ #define TF_CONDFLAG_TELEPORTGLOW (1 << 6) #define TF_CONDFLAG_TAUNTING (1 << 7) #define TF_CONDFLAG_UBERCHARGEFADE (1 << 8) +#define TF_CONDFLAG_CLOAKFLICKER (1 << 9) #define TF_CONDFLAG_TELEPORTING (1 << 10) #define TF_CONDFLAG_KRITZKRIEGED (1 << 11) #define TF_CONDFLAG_DEADRINGERED (1 << 13) @@ -192,7 +193,9 @@ enum { TF_WEAPON_SENTRY_REVENGE, TF_WEAPON_JAR_MILK, TF_WEAPON_HANDGUN_SCOUT_PRIMARY, - TF_WEAPON_BAT_FISH + TF_WEAPON_BAT_FISH, + TF_WEAPON_CROSSBOW, + TF_WEAPON_STICKBOMB }; // Identifiers for the eventtype property on the teamplay_flag_event event