MapBase/source-sdk-2013-mapbase
1
0
Fork 0
mirror of https://github.com/mapbase-source/source-sdk-2013.git synced 2025-01-27 14:17:59 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fixed shared activity collisions involving the new unused weapon activities

Browse Source
This commit is contained in:
Blixibon 2021-11-21 11:00:27 -06:00
parent 1130a40d1e
commit 808ea9bb8c
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
sp/src/game/server/ai_activity.cpp
View File

@ -2313,13 +2313,13 @@ void CAI_BaseNPC::InitDefaultActivitySR(void)
ADD_ACTIVITY_TO_SR( ACT_RUN_AR1 );
ADD_ACTIVITY_TO_SR( ACT_WALK_AIM_AR1 );
ADD_ACTIVITY_TO_SR( ACT_RUN_AIM_AR1 );
ADD_ACTIVITY_TO_SR( ACT_RANGE_ATTACK_AR1 );
//ADD_ACTIVITY_TO_SR( ACT_RANGE_ATTACK_AR1 );
ADD_ACTIVITY_TO_SR( ACT_RELOAD_AR1 );
ADD_ACTIVITY_TO_SR( ACT_RANGE_ATTACK_AR1_LOW );
ADD_ACTIVITY_TO_SR( ACT_RELOAD_AR1_LOW );
ADD_ACTIVITY_TO_SR( ACT_COVER_AR1_LOW );
ADD_ACTIVITY_TO_SR( ACT_RANGE_AIM_AR1_LOW );
ADD_ACTIVITY_TO_SR( ACT_GESTURE_RANGE_ATTACK_AR1 );
//ADD_ACTIVITY_TO_SR( ACT_GESTURE_RANGE_ATTACK_AR1 );
ADD_ACTIVITY_TO_SR( ACT_GESTURE_RELOAD_AR1 );
ADD_ACTIVITY_TO_SR( ACT_IDLE_AR1_RELAXED );
@ -2339,13 +2339,13 @@ void CAI_BaseNPC::InitDefaultActivitySR(void)
ADD_ACTIVITY_TO_SR( ACT_RUN_SMG2 );
ADD_ACTIVITY_TO_SR( ACT_WALK_AIM_SMG2 );
ADD_ACTIVITY_TO_SR( ACT_RUN_AIM_SMG2 );
ADD_ACTIVITY_TO_SR( ACT_RANGE_ATTACK_SMG2 );
//ADD_ACTIVITY_TO_SR( ACT_RANGE_ATTACK_SMG2 );
ADD_ACTIVITY_TO_SR( ACT_RELOAD_SMG2 );
ADD_ACTIVITY_TO_SR( ACT_RANGE_ATTACK_SMG2_LOW );
ADD_ACTIVITY_TO_SR( ACT_RELOAD_SMG2_LOW );
ADD_ACTIVITY_TO_SR( ACT_COVER_SMG2_LOW );
ADD_ACTIVITY_TO_SR( ACT_RANGE_AIM_SMG2_LOW );
ADD_ACTIVITY_TO_SR( ACT_GESTURE_RANGE_ATTACK_SMG2 );
//ADD_ACTIVITY_TO_SR( ACT_GESTURE_RANGE_ATTACK_SMG2 );
ADD_ACTIVITY_TO_SR( ACT_GESTURE_RELOAD_SMG2 );
ADD_ACTIVITY_TO_SR( ACT_IDLE_SMG2_RELAXED );
@ -2365,13 +2365,13 @@ void CAI_BaseNPC::InitDefaultActivitySR(void)
ADD_ACTIVITY_TO_SR( ACT_RUN_SNIPER_RIFLE );
ADD_ACTIVITY_TO_SR( ACT_WALK_AIM_SNIPER_RIFLE );
ADD_ACTIVITY_TO_SR( ACT_RUN_AIM_SNIPER_RIFLE );
ADD_ACTIVITY_TO_SR( ACT_RANGE_ATTACK_SNIPER_RIFLE );
//ADD_ACTIVITY_TO_SR( ACT_RANGE_ATTACK_SNIPER_RIFLE );
ADD_ACTIVITY_TO_SR( ACT_RELOAD_SNIPER_RIFLE );
ADD_ACTIVITY_TO_SR( ACT_RANGE_ATTACK_SNIPER_RIFLE_LOW );
ADD_ACTIVITY_TO_SR( ACT_RELOAD_SNIPER_RIFLE_LOW );
ADD_ACTIVITY_TO_SR( ACT_COVER_SNIPER_RIFLE_LOW );
ADD_ACTIVITY_TO_SR( ACT_RANGE_AIM_SNIPER_RIFLE_LOW );
ADD_ACTIVITY_TO_SR( ACT_GESTURE_RANGE_ATTACK_SNIPER_RIFLE );
//ADD_ACTIVITY_TO_SR( ACT_GESTURE_RANGE_ATTACK_SNIPER_RIFLE );
ADD_ACTIVITY_TO_SR( ACT_GESTURE_RELOAD_SNIPER_RIFLE );
ADD_ACTIVITY_TO_SR( ACT_IDLE_SNIPER_RIFLE_RELAXED );

12
sp/src/game/shared/activitylist.cpp
View File

@ -2429,13 +2429,13 @@ void ActivityList_RegisterSharedActivities( void )
REGISTER_SHARED_ACTIVITY( ACT_RUN_AR1 );
REGISTER_SHARED_ACTIVITY( ACT_WALK_AIM_AR1 );
REGISTER_SHARED_ACTIVITY( ACT_RUN_AIM_AR1 );
REGISTER_SHARED_ACTIVITY( ACT_RANGE_ATTACK_AR1 );
//REGISTER_SHARED_ACTIVITY( ACT_RANGE_ATTACK_AR1 );
REGISTER_SHARED_ACTIVITY( ACT_RELOAD_AR1 );
REGISTER_SHARED_ACTIVITY( ACT_RANGE_ATTACK_AR1_LOW );
REGISTER_SHARED_ACTIVITY( ACT_RELOAD_AR1_LOW );
REGISTER_SHARED_ACTIVITY( ACT_COVER_AR1_LOW );
REGISTER_SHARED_ACTIVITY( ACT_RANGE_AIM_AR1_LOW );
REGISTER_SHARED_ACTIVITY( ACT_GESTURE_RANGE_ATTACK_AR1 );
//REGISTER_SHARED_ACTIVITY( ACT_GESTURE_RANGE_ATTACK_AR1 );
REGISTER_SHARED_ACTIVITY( ACT_GESTURE_RELOAD_AR1 );
REGISTER_SHARED_ACTIVITY( ACT_IDLE_AR1_RELAXED );
@ -2455,13 +2455,13 @@ void ActivityList_RegisterSharedActivities( void )
REGISTER_SHARED_ACTIVITY( ACT_RUN_SMG2 );
REGISTER_SHARED_ACTIVITY( ACT_WALK_AIM_SMG2 );
REGISTER_SHARED_ACTIVITY( ACT_RUN_AIM_SMG2 );
REGISTER_SHARED_ACTIVITY( ACT_RANGE_ATTACK_SMG2 );
//REGISTER_SHARED_ACTIVITY( ACT_RANGE_ATTACK_SMG2 );
REGISTER_SHARED_ACTIVITY( ACT_RELOAD_SMG2 );
REGISTER_SHARED_ACTIVITY( ACT_RANGE_ATTACK_SMG2_LOW );
REGISTER_SHARED_ACTIVITY( ACT_RELOAD_SMG2_LOW );
REGISTER_SHARED_ACTIVITY( ACT_COVER_SMG2_LOW );
REGISTER_SHARED_ACTIVITY( ACT_RANGE_AIM_SMG2_LOW );
REGISTER_SHARED_ACTIVITY( ACT_GESTURE_RANGE_ATTACK_SMG2 );
//REGISTER_SHARED_ACTIVITY( ACT_GESTURE_RANGE_ATTACK_SMG2 );
REGISTER_SHARED_ACTIVITY( ACT_GESTURE_RELOAD_SMG2 );
REGISTER_SHARED_ACTIVITY( ACT_IDLE_SMG2_RELAXED );
@ -2481,13 +2481,13 @@ void ActivityList_RegisterSharedActivities( void )
REGISTER_SHARED_ACTIVITY( ACT_RUN_SNIPER_RIFLE );
REGISTER_SHARED_ACTIVITY( ACT_WALK_AIM_SNIPER_RIFLE );
REGISTER_SHARED_ACTIVITY( ACT_RUN_AIM_SNIPER_RIFLE );
REGISTER_SHARED_ACTIVITY( ACT_RANGE_ATTACK_SNIPER_RIFLE );
//REGISTER_SHARED_ACTIVITY( ACT_RANGE_ATTACK_SNIPER_RIFLE );
REGISTER_SHARED_ACTIVITY( ACT_RELOAD_SNIPER_RIFLE );
REGISTER_SHARED_ACTIVITY( ACT_RANGE_ATTACK_SNIPER_RIFLE_LOW );
REGISTER_SHARED_ACTIVITY( ACT_RELOAD_SNIPER_RIFLE_LOW );
REGISTER_SHARED_ACTIVITY( ACT_COVER_SNIPER_RIFLE_LOW );
REGISTER_SHARED_ACTIVITY( ACT_RANGE_AIM_SNIPER_RIFLE_LOW );
REGISTER_SHARED_ACTIVITY( ACT_GESTURE_RANGE_ATTACK_SNIPER_RIFLE );
//REGISTER_SHARED_ACTIVITY( ACT_GESTURE_RANGE_ATTACK_SNIPER_RIFLE );
REGISTER_SHARED_ACTIVITY( ACT_GESTURE_RELOAD_SNIPER_RIFLE );
REGISTER_SHARED_ACTIVITY( ACT_IDLE_SNIPER_RIFLE_RELAXED );