From 4d0ca13efb2ece02206e3d4c7889d4c2f777d0c4 Mon Sep 17 00:00:00 2001 From: Blixibon Date: Wed, 17 Nov 2021 00:20:48 -0600 Subject: [PATCH] Renamed the new HL2:DM "357" activities to "REVOLVER" activities --- sp/src/game/server/ai_activity.cpp | 18 +++++++++--------- sp/src/game/server/hl2/weapon_357.cpp | 18 +++++++++--------- sp/src/game/shared/activitylist.cpp | 18 +++++++++--------- sp/src/game/shared/ai_activity.h | 18 +++++++++--------- 4 files changed, 36 insertions(+), 36 deletions(-) diff --git a/sp/src/game/server/ai_activity.cpp b/sp/src/game/server/ai_activity.cpp index f1a36cf8..4fd0300b 100644 --- a/sp/src/game/server/ai_activity.cpp +++ b/sp/src/game/server/ai_activity.cpp @@ -2370,15 +2370,15 @@ void CAI_BaseNPC::InitDefaultActivitySR(void) ADD_ACTIVITY_TO_SR( ACT_HL2MP_GESTURE_RANGE_ATTACK2_MELEE ); ADD_ACTIVITY_TO_SR( ACT_HL2MP_GESTURE_RANGE_ATTACK2_SLAM ); - ADD_ACTIVITY_TO_SR( ACT_HL2MP_IDLE_357 ); - ADD_ACTIVITY_TO_SR( ACT_HL2MP_RUN_357 ); - ADD_ACTIVITY_TO_SR( ACT_HL2MP_WALK_357 ); - ADD_ACTIVITY_TO_SR( ACT_HL2MP_IDLE_CROUCH_357 ); - ADD_ACTIVITY_TO_SR( ACT_HL2MP_WALK_CROUCH_357 ); - ADD_ACTIVITY_TO_SR( ACT_HL2MP_GESTURE_RANGE_ATTACK_357 ); - ADD_ACTIVITY_TO_SR( ACT_HL2MP_GESTURE_RANGE_ATTACK2_357 ); - ADD_ACTIVITY_TO_SR( ACT_HL2MP_GESTURE_RELOAD_357 ); - ADD_ACTIVITY_TO_SR( ACT_HL2MP_JUMP_357 ); + ADD_ACTIVITY_TO_SR( ACT_HL2MP_IDLE_REVOLVER ); + ADD_ACTIVITY_TO_SR( ACT_HL2MP_RUN_REVOLVER ); + ADD_ACTIVITY_TO_SR( ACT_HL2MP_WALK_REVOLVER ); + ADD_ACTIVITY_TO_SR( ACT_HL2MP_IDLE_CROUCH_REVOLVER ); + ADD_ACTIVITY_TO_SR( ACT_HL2MP_WALK_CROUCH_REVOLVER ); + ADD_ACTIVITY_TO_SR( ACT_HL2MP_GESTURE_RANGE_ATTACK_REVOLVER ); + ADD_ACTIVITY_TO_SR( ACT_HL2MP_GESTURE_RANGE_ATTACK2_REVOLVER ); + ADD_ACTIVITY_TO_SR( ACT_HL2MP_GESTURE_RELOAD_REVOLVER ); + ADD_ACTIVITY_TO_SR( ACT_HL2MP_JUMP_REVOLVER ); #endif } diff --git a/sp/src/game/server/hl2/weapon_357.cpp b/sp/src/game/server/hl2/weapon_357.cpp index b0ae2131..38a15246 100644 --- a/sp/src/game/server/hl2/weapon_357.cpp +++ b/sp/src/game/server/hl2/weapon_357.cpp @@ -202,15 +202,15 @@ acttable_t CWeapon357::m_acttable[] = #ifdef MAPBASE // HL2:DM activities (for third-person animations in SP) #ifdef EXPANDED_HL2DM_ACTIVITIES - { ACT_HL2MP_IDLE, ACT_HL2MP_IDLE_357, false }, - { ACT_HL2MP_RUN, ACT_HL2MP_RUN_357, false }, - { ACT_HL2MP_WALK, ACT_HL2MP_WALK_357, false }, - { ACT_HL2MP_IDLE_CROUCH, ACT_HL2MP_IDLE_CROUCH_357, false }, - { ACT_HL2MP_WALK_CROUCH, ACT_HL2MP_WALK_CROUCH_357, false }, - { ACT_HL2MP_GESTURE_RANGE_ATTACK, ACT_HL2MP_GESTURE_RANGE_ATTACK_357, false }, - { ACT_HL2MP_GESTURE_RANGE_ATTACK2, ACT_HL2MP_GESTURE_RANGE_ATTACK2_357, false }, - { ACT_HL2MP_GESTURE_RELOAD, ACT_HL2MP_GESTURE_RELOAD_357, false }, - { ACT_HL2MP_JUMP, ACT_HL2MP_JUMP_357, false }, + { ACT_HL2MP_IDLE, ACT_HL2MP_IDLE_REVOLVER, false }, + { ACT_HL2MP_RUN, ACT_HL2MP_RUN_REVOLVER, false }, + { ACT_HL2MP_WALK, ACT_HL2MP_WALK_REVOLVER, false }, + { ACT_HL2MP_IDLE_CROUCH, ACT_HL2MP_IDLE_CROUCH_REVOLVER, false }, + { ACT_HL2MP_WALK_CROUCH, ACT_HL2MP_WALK_CROUCH_REVOLVER, false }, + { ACT_HL2MP_GESTURE_RANGE_ATTACK, ACT_HL2MP_GESTURE_RANGE_ATTACK_REVOLVER, false }, + { ACT_HL2MP_GESTURE_RANGE_ATTACK2, ACT_HL2MP_GESTURE_RANGE_ATTACK2_REVOLVER, false }, + { ACT_HL2MP_GESTURE_RELOAD, ACT_HL2MP_GESTURE_RELOAD_REVOLVER, false }, + { ACT_HL2MP_JUMP, ACT_HL2MP_JUMP_REVOLVER, false }, #else { ACT_HL2MP_IDLE, ACT_HL2MP_IDLE_PISTOL, false }, { ACT_HL2MP_RUN, ACT_HL2MP_RUN_PISTOL, false }, diff --git a/sp/src/game/shared/activitylist.cpp b/sp/src/game/shared/activitylist.cpp index 4493a50c..e7326e64 100644 --- a/sp/src/game/shared/activitylist.cpp +++ b/sp/src/game/shared/activitylist.cpp @@ -2486,15 +2486,15 @@ void ActivityList_RegisterSharedActivities( void ) REGISTER_SHARED_ACTIVITY( ACT_HL2MP_GESTURE_RANGE_ATTACK2_MELEE ); REGISTER_SHARED_ACTIVITY( ACT_HL2MP_GESTURE_RANGE_ATTACK2_SLAM ); - REGISTER_SHARED_ACTIVITY( ACT_HL2MP_IDLE_357 ); - REGISTER_SHARED_ACTIVITY( ACT_HL2MP_RUN_357 ); - REGISTER_SHARED_ACTIVITY( ACT_HL2MP_WALK_357 ); - REGISTER_SHARED_ACTIVITY( ACT_HL2MP_IDLE_CROUCH_357 ); - REGISTER_SHARED_ACTIVITY( ACT_HL2MP_WALK_CROUCH_357 ); - REGISTER_SHARED_ACTIVITY( ACT_HL2MP_GESTURE_RANGE_ATTACK_357 ); - REGISTER_SHARED_ACTIVITY( ACT_HL2MP_GESTURE_RANGE_ATTACK2_357 ); - REGISTER_SHARED_ACTIVITY( ACT_HL2MP_GESTURE_RELOAD_357 ); - REGISTER_SHARED_ACTIVITY( ACT_HL2MP_JUMP_357 ); + REGISTER_SHARED_ACTIVITY( ACT_HL2MP_IDLE_REVOLVER ); + REGISTER_SHARED_ACTIVITY( ACT_HL2MP_RUN_REVOLVER ); + REGISTER_SHARED_ACTIVITY( ACT_HL2MP_WALK_REVOLVER ); + REGISTER_SHARED_ACTIVITY( ACT_HL2MP_IDLE_CROUCH_REVOLVER ); + REGISTER_SHARED_ACTIVITY( ACT_HL2MP_WALK_CROUCH_REVOLVER ); + REGISTER_SHARED_ACTIVITY( ACT_HL2MP_GESTURE_RANGE_ATTACK_REVOLVER ); + REGISTER_SHARED_ACTIVITY( ACT_HL2MP_GESTURE_RANGE_ATTACK2_REVOLVER ); + REGISTER_SHARED_ACTIVITY( ACT_HL2MP_GESTURE_RELOAD_REVOLVER ); + REGISTER_SHARED_ACTIVITY( ACT_HL2MP_JUMP_REVOLVER ); #endif AssertMsg( g_HighestActivity == LAST_SHARED_ACTIVITY - 1, "Not all activities from ai_activity.h registered in activitylist.cpp" ); diff --git a/sp/src/game/shared/ai_activity.h b/sp/src/game/shared/ai_activity.h index e73c571a..39cc48fc 100644 --- a/sp/src/game/shared/ai_activity.h +++ b/sp/src/game/shared/ai_activity.h @@ -2374,15 +2374,15 @@ typedef enum ACT_HL2MP_GESTURE_RANGE_ATTACK2_MELEE, ACT_HL2MP_GESTURE_RANGE_ATTACK2_SLAM, - ACT_HL2MP_IDLE_357, - ACT_HL2MP_RUN_357, - ACT_HL2MP_WALK_357, - ACT_HL2MP_IDLE_CROUCH_357, - ACT_HL2MP_WALK_CROUCH_357, - ACT_HL2MP_GESTURE_RANGE_ATTACK_357, - ACT_HL2MP_GESTURE_RANGE_ATTACK2_357, - ACT_HL2MP_GESTURE_RELOAD_357, - ACT_HL2MP_JUMP_357, + ACT_HL2MP_IDLE_REVOLVER, + ACT_HL2MP_RUN_REVOLVER, + ACT_HL2MP_WALK_REVOLVER, + ACT_HL2MP_IDLE_CROUCH_REVOLVER, + ACT_HL2MP_WALK_CROUCH_REVOLVER, + ACT_HL2MP_GESTURE_RANGE_ATTACK_REVOLVER, + ACT_HL2MP_GESTURE_RANGE_ATTACK2_REVOLVER, + ACT_HL2MP_GESTURE_RELOAD_REVOLVER, + ACT_HL2MP_JUMP_REVOLVER, #endif // this is the end of the global activities, private per-monster activities start here.