aboutsummaryrefslogtreecommitdiff
path: root/mp/src/game/shared/activitylist.cpp
diff options
context:
space:
mode:
authorJohn Schoenick <[email protected]>2015-09-09 18:35:41 -0700
committerJohn Schoenick <[email protected]>2015-09-09 18:35:41 -0700
commit0d8dceea4310fde5706b3ce1c70609d72a38efdf (patch)
treec831ef32c2c801a5c5a80401736b52c7b5a528ec /mp/src/game/shared/activitylist.cpp
parentUpdated the SDK with the latest code from the TF and HL2 branches. (diff)
downloadsource-sdk-2013-0d8dceea4310fde5706b3ce1c70609d72a38efdf.tar.xz
source-sdk-2013-0d8dceea4310fde5706b3ce1c70609d72a38efdf.zip
Updated the SDK with the latest code from the TF and HL2 branches.HEADmaster
Diffstat (limited to 'mp/src/game/shared/activitylist.cpp')
-rw-r--r--mp/src/game/shared/activitylist.cpp47
1 files changed, 47 insertions, 0 deletions
diff --git a/mp/src/game/shared/activitylist.cpp b/mp/src/game/shared/activitylist.cpp
index 4c882d47..49e93e93 100644
--- a/mp/src/game/shared/activitylist.cpp
+++ b/mp/src/game/shared/activitylist.cpp
@@ -1802,6 +1802,11 @@ void ActivityList_RegisterSharedActivities( void )
REGISTER_SHARED_ACTIVITY( ACT_MP_ATTACK_SWIM_GRENADE_ITEM2 );
REGISTER_SHARED_ACTIVITY( ACT_MP_ATTACK_AIRWALK_GRENADE_ITEM2 );
+ // Passtime
+ REGISTER_SHARED_ACTIVITY( ACT_MP_STAND_PASSTIME );
+ REGISTER_SHARED_ACTIVITY( ACT_MP_RUN_PASSTIME );
+ REGISTER_SHARED_ACTIVITY( ACT_MP_CROUCHWALK_PASSTIME );
+
// Flinches
REGISTER_SHARED_ACTIVITY( ACT_MP_GESTURE_FLINCH );
REGISTER_SHARED_ACTIVITY( ACT_MP_GESTURE_FLINCH_PRIMARY );
@@ -1943,6 +1948,7 @@ void ActivityList_RegisterSharedActivities( void )
REGISTER_SHARED_ACTIVITY ( ACT_MP_DOUBLEJUMP_CROUCH_ITEM1 );
REGISTER_SHARED_ACTIVITY ( ACT_MP_DOUBLEJUMP_CROUCH_ITEM2 );
REGISTER_SHARED_ACTIVITY ( ACT_MP_DOUBLEJUMP_CROUCH_LOSERSTATE );
+ REGISTER_SHARED_ACTIVITY ( ACT_MP_DOUBLEJUMP_CROUCH_PASSTIME );
REGISTER_SHARED_ACTIVITY( ACT_MP_GESTURE_VC_HANDMOUTH );
REGISTER_SHARED_ACTIVITY( ACT_MP_GESTURE_VC_FINGERPOINT );
@@ -2004,6 +2010,11 @@ void ActivityList_RegisterSharedActivities( void )
REGISTER_SHARED_ACTIVITY( ACT_MP_STUN_MIDDLE );
REGISTER_SHARED_ACTIVITY( ACT_MP_STUN_END );
+ REGISTER_SHARED_ACTIVITY( ACT_MP_PASSTIME_THROW_BEGIN );
+ REGISTER_SHARED_ACTIVITY( ACT_MP_PASSTIME_THROW_MIDDLE );
+ REGISTER_SHARED_ACTIVITY( ACT_MP_PASSTIME_THROW_END );
+ REGISTER_SHARED_ACTIVITY( ACT_MP_PASSTIME_THROW_CANCEL );
+
REGISTER_SHARED_ACTIVITY ( ACT_VM_UNUSABLE );
REGISTER_SHARED_ACTIVITY ( ACT_VM_UNUSABLE_TO_USABLE );
REGISTER_SHARED_ACTIVITY ( ACT_VM_USABLE_TO_UNUSABLE );
@@ -2304,6 +2315,42 @@ void ActivityList_RegisterSharedActivities( void )
REGISTER_SHARED_ACTIVITY( ACT_BOT_PANIC_START );
REGISTER_SHARED_ACTIVITY( ACT_BOT_PANIC_END );
+ REGISTER_SHARED_ACTIVITY( ACT_ENGINEER_REVOLVER_DRAW );
+ REGISTER_SHARED_ACTIVITY( ACT_ENGINEER_REVOLVER_IDLE );
+ REGISTER_SHARED_ACTIVITY( ACT_ENGINEER_REVOLVER_PRIMARYATTACK );
+ REGISTER_SHARED_ACTIVITY( ACT_ENGINEER_REVOLVER_RELOAD );
+
+ REGISTER_SHARED_ACTIVITY( ACT_KART_IDLE );
+ REGISTER_SHARED_ACTIVITY( ACT_KART_ACTION_SHOOT );
+ REGISTER_SHARED_ACTIVITY( ACT_KART_ACTION_DASH );
+ REGISTER_SHARED_ACTIVITY( ACT_KART_JUMP_START );
+ REGISTER_SHARED_ACTIVITY( ACT_KART_JUMP_FLOAT );
+ REGISTER_SHARED_ACTIVITY( ACT_KART_JUMP_LAND );
+ REGISTER_SHARED_ACTIVITY( ACT_KART_IMPACT );
+ REGISTER_SHARED_ACTIVITY( ACT_KART_IMPACT_BIG );
+ REGISTER_SHARED_ACTIVITY( ACT_KART_GESTURE_POSITIVE );
+ REGISTER_SHARED_ACTIVITY( ACT_KART_GESTURE_NEGATIVE );
+
+ REGISTER_SHARED_ACTIVITY( ACT_GRAPPLE_DRAW );
+ REGISTER_SHARED_ACTIVITY( ACT_GRAPPLE_IDLE );
+ REGISTER_SHARED_ACTIVITY( ACT_GRAPPLE_FIRE_START );
+ REGISTER_SHARED_ACTIVITY( ACT_GRAPPLE_FIRE_IDLE );
+ REGISTER_SHARED_ACTIVITY( ACT_GRAPPLE_PULL_START );
+ REGISTER_SHARED_ACTIVITY( ACT_GRAPPLE_PULL_IDLE );
+ REGISTER_SHARED_ACTIVITY( ACT_GRAPPLE_PULL_END );
+
+ REGISTER_SHARED_ACTIVITY( ACT_PRIMARY_VM_INSPECT_START );
+ REGISTER_SHARED_ACTIVITY( ACT_PRIMARY_VM_INSPECT_IDLE );
+ REGISTER_SHARED_ACTIVITY( ACT_PRIMARY_VM_INSPECT_END );
+
+ REGISTER_SHARED_ACTIVITY( ACT_SECONDARY_VM_INSPECT_START );
+ REGISTER_SHARED_ACTIVITY( ACT_SECONDARY_VM_INSPECT_IDLE );
+ REGISTER_SHARED_ACTIVITY( ACT_SECONDARY_VM_INSPECT_END );
+
+ REGISTER_SHARED_ACTIVITY( ACT_MELEE_VM_INSPECT_START );
+ REGISTER_SHARED_ACTIVITY( ACT_MELEE_VM_INSPECT_IDLE );
+ REGISTER_SHARED_ACTIVITY( ACT_MELEE_VM_INSPECT_END );
+
AssertMsg( g_HighestActivity == LAST_SHARED_ACTIVITY - 1, "Not all activities from ai_activity.h registered in activitylist.cpp" );
}