MapBase/source-sdk-2013-mapbase
1
0
Fork 0
mirror of https://github.com/mapbase-source/source-sdk-2013.git synced 2024-10-16 23:37:06 +03:00
Code Issues Packages Projects Releases Wiki Activity

Renamed the new HL2:DM "357" activities to "REVOLVER" activities

Browse Source
This commit is contained in:
Blixibon 2021-11-17 00:20:48 -06:00
parent dc6d4e0963
commit 4d0ca13efb
4 changed files with 36 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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
}

18
sp/src/game/server/hl2/weapon_357.cpp
View File

@ -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 },

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

@ -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" );

18
sp/src/game/shared/ai_activity.h
View File

@ -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.