diff options
| author | Narendra Umate <[email protected]> | 2013-12-08 01:27:41 -0800 |
|---|---|---|
| committer | Narendra Umate <[email protected]> | 2013-12-08 01:27:41 -0800 |
| commit | 4fa56874ba1557274c10077bf8386ece4c61dbd6 (patch) | |
| tree | e2d336604e960b548e996d2e7dcfc5a1e1401b9e /mp/src/game/shared/activitylist.cpp | |
| parent | Added DS_Store to .gitignore. (diff) | |
| parent | Make libSDL2.so/dylib into symlinks. (diff) | |
| download | source-sdk-2013-4fa56874ba1557274c10077bf8386ece4c61dbd6.tar.xz source-sdk-2013-4fa56874ba1557274c10077bf8386ece4c61dbd6.zip | |
Merge remote-tracking branch 'upstream/master'
Reverted .gitattributes xcode_ccache_wrapper change. Fixed line endings
for .gitignore and .gitattributes.
Diffstat (limited to 'mp/src/game/shared/activitylist.cpp')
| -rw-r--r-- | mp/src/game/shared/activitylist.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/mp/src/game/shared/activitylist.cpp b/mp/src/game/shared/activitylist.cpp index 94bcff15..2b421252 100644 --- a/mp/src/game/shared/activitylist.cpp +++ b/mp/src/game/shared/activitylist.cpp @@ -2270,6 +2270,11 @@ void ActivityList_RegisterSharedActivities( void ) REGISTER_SHARED_ACTIVITY( ACT_THROWABLE_VM_IDLE ); REGISTER_SHARED_ACTIVITY( ACT_THROWABLE_VM_FIRE ); + REGISTER_SHARED_ACTIVITY( ACT_SPELL_VM_DRAW ); + REGISTER_SHARED_ACTIVITY( ACT_SPELL_VM_IDLE ); + REGISTER_SHARED_ACTIVITY( ACT_SPELL_VM_ARM ); + REGISTER_SHARED_ACTIVITY( ACT_SPELL_VM_FIRE ); + AssertMsg( g_HighestActivity == LAST_SHARED_ACTIVITY - 1, "Not all activities from ai_activity.h registered in activitylist.cpp" ); } |