From 440c8b512177bba0615308274e361af946d871c5 Mon Sep 17 00:00:00 2001 From: Blixibon Date: Thu, 4 Nov 2021 08:26:39 -0500 Subject: [PATCH] Fixed an oversight with new weapon activities preventing NPC weapon pickup --- sp/src/game/server/hl2/weapon_357.cpp | 2 +- sp/src/game/server/hl2/weapon_ar2.cpp | 10 +++++----- sp/src/game/server/hl2/weapon_crossbow.cpp | 2 +- sp/src/game/server/hl2/weapon_pistol.cpp | 10 +++++----- sp/src/game/server/hl2/weapon_rpg.cpp | 2 +- sp/src/game/server/hl2/weapon_shotgun.cpp | 2 +- sp/src/game/server/hl2/weapon_smg1.cpp | 10 +++++----- 7 files changed, 19 insertions(+), 19 deletions(-) diff --git a/sp/src/game/server/hl2/weapon_357.cpp b/sp/src/game/server/hl2/weapon_357.cpp index 16c57991..8b4fe93f 100644 --- a/sp/src/game/server/hl2/weapon_357.cpp +++ b/sp/src/game/server/hl2/weapon_357.cpp @@ -196,7 +196,7 @@ acttable_t CWeapon357::m_acttable[] = #ifdef EXPANDED_HL2_COVER_ACTIVITIES { ACT_RANGE_AIM_MED, ACT_RANGE_AIM_REVOLVER_MED, false }, - { ACT_RANGE_ATTACK1_MED, ACT_RANGE_ATTACK_REVOLVER_MED, true }, + { ACT_RANGE_ATTACK1_MED, ACT_RANGE_ATTACK_REVOLVER_MED, false }, #endif }; diff --git a/sp/src/game/server/hl2/weapon_ar2.cpp b/sp/src/game/server/hl2/weapon_ar2.cpp index 35305f59..e6a32e93 100644 --- a/sp/src/game/server/hl2/weapon_ar2.cpp +++ b/sp/src/game/server/hl2/weapon_ar2.cpp @@ -164,12 +164,12 @@ acttable_t CWeaponAR2::m_acttable[] = #ifdef EXPANDED_HL2_COVER_ACTIVITIES { ACT_RANGE_AIM_MED, ACT_RANGE_AIM_AR2_MED, false }, - { ACT_RANGE_ATTACK1_MED, ACT_RANGE_ATTACK_AR2_MED, true }, + { ACT_RANGE_ATTACK1_MED, ACT_RANGE_ATTACK_AR2_MED, false }, - { ACT_COVER_WALL_R, ACT_COVER_WALL_R_RIFLE, true }, - { ACT_COVER_WALL_L, ACT_COVER_WALL_L_RIFLE, true }, - { ACT_COVER_WALL_LOW_R, ACT_COVER_WALL_LOW_R_RIFLE, true }, - { ACT_COVER_WALL_LOW_L, ACT_COVER_WALL_LOW_L_RIFLE, true }, + { ACT_COVER_WALL_R, ACT_COVER_WALL_R_RIFLE, false }, + { ACT_COVER_WALL_L, ACT_COVER_WALL_L_RIFLE, false }, + { ACT_COVER_WALL_LOW_R, ACT_COVER_WALL_LOW_R_RIFLE, false }, + { ACT_COVER_WALL_LOW_L, ACT_COVER_WALL_LOW_L_RIFLE, false }, #endif }; diff --git a/sp/src/game/server/hl2/weapon_crossbow.cpp b/sp/src/game/server/hl2/weapon_crossbow.cpp index f1b5009a..20ec1cc9 100644 --- a/sp/src/game/server/hl2/weapon_crossbow.cpp +++ b/sp/src/game/server/hl2/weapon_crossbow.cpp @@ -718,7 +718,7 @@ acttable_t CWeaponCrossbow::m_acttable[] = #ifdef EXPANDED_HL2_COVER_ACTIVITIES { ACT_RANGE_AIM_MED, ACT_RANGE_AIM_CROSSBOW_MED, false }, - { ACT_RANGE_ATTACK1_MED, ACT_RANGE_ATTACK_CROSSBOW_MED, true }, + { ACT_RANGE_ATTACK1_MED, ACT_RANGE_ATTACK_CROSSBOW_MED, false }, #endif }; diff --git a/sp/src/game/server/hl2/weapon_pistol.cpp b/sp/src/game/server/hl2/weapon_pistol.cpp index eff09cfe..a04d30b6 100644 --- a/sp/src/game/server/hl2/weapon_pistol.cpp +++ b/sp/src/game/server/hl2/weapon_pistol.cpp @@ -250,12 +250,12 @@ acttable_t CWeaponPistol::m_acttable[] = #ifdef EXPANDED_HL2_COVER_ACTIVITIES { ACT_RANGE_AIM_MED, ACT_RANGE_AIM_PISTOL_MED, false }, - { ACT_RANGE_ATTACK1_MED, ACT_RANGE_ATTACK_PISTOL_MED, true }, + { ACT_RANGE_ATTACK1_MED, ACT_RANGE_ATTACK_PISTOL_MED, false }, - { ACT_COVER_WALL_R, ACT_COVER_WALL_R_PISTOL, true }, - { ACT_COVER_WALL_L, ACT_COVER_WALL_L_PISTOL, true }, - { ACT_COVER_WALL_LOW_R, ACT_COVER_WALL_LOW_R_PISTOL, true }, - { ACT_COVER_WALL_LOW_L, ACT_COVER_WALL_LOW_L_PISTOL, true }, + { ACT_COVER_WALL_R, ACT_COVER_WALL_R_PISTOL, false }, + { ACT_COVER_WALL_L, ACT_COVER_WALL_L_PISTOL, false }, + { ACT_COVER_WALL_LOW_R, ACT_COVER_WALL_LOW_R_PISTOL, false }, + { ACT_COVER_WALL_LOW_L, ACT_COVER_WALL_LOW_L_PISTOL, false }, #endif }; diff --git a/sp/src/game/server/hl2/weapon_rpg.cpp b/sp/src/game/server/hl2/weapon_rpg.cpp index 72ee96f9..2d20211d 100644 --- a/sp/src/game/server/hl2/weapon_rpg.cpp +++ b/sp/src/game/server/hl2/weapon_rpg.cpp @@ -1424,7 +1424,7 @@ acttable_t CWeaponRPG::m_acttable[] = #ifdef EXPANDED_HL2_COVER_ACTIVITIES { ACT_RANGE_AIM_MED, ACT_RANGE_AIM_RPG_MED, false }, - { ACT_RANGE_ATTACK1_MED, ACT_RANGE_ATTACK_RPG_MED, true }, + { ACT_RANGE_ATTACK1_MED, ACT_RANGE_ATTACK_RPG_MED, false }, #endif }; diff --git a/sp/src/game/server/hl2/weapon_shotgun.cpp b/sp/src/game/server/hl2/weapon_shotgun.cpp index a1a228c8..e0b2e336 100644 --- a/sp/src/game/server/hl2/weapon_shotgun.cpp +++ b/sp/src/game/server/hl2/weapon_shotgun.cpp @@ -213,7 +213,7 @@ acttable_t CWeaponShotgun::m_acttable[] = #ifdef EXPANDED_HL2_COVER_ACTIVITIES { ACT_RANGE_AIM_MED, ACT_RANGE_AIM_SHOTGUN_MED, false }, - { ACT_RANGE_ATTACK1_MED, ACT_RANGE_ATTACK_SHOTGUN_MED, true }, + { ACT_RANGE_ATTACK1_MED, ACT_RANGE_ATTACK_SHOTGUN_MED, false }, #endif }; diff --git a/sp/src/game/server/hl2/weapon_smg1.cpp b/sp/src/game/server/hl2/weapon_smg1.cpp index 3589358e..04f7e390 100644 --- a/sp/src/game/server/hl2/weapon_smg1.cpp +++ b/sp/src/game/server/hl2/weapon_smg1.cpp @@ -142,12 +142,12 @@ acttable_t CWeaponSMG1::m_acttable[] = #ifdef EXPANDED_HL2_COVER_ACTIVITIES { ACT_RANGE_AIM_MED, ACT_RANGE_AIM_SMG1_MED, false }, - { ACT_RANGE_ATTACK1_MED, ACT_RANGE_ATTACK_SMG1_MED, true }, + { ACT_RANGE_ATTACK1_MED, ACT_RANGE_ATTACK_SMG1_MED, false }, - { ACT_COVER_WALL_R, ACT_COVER_WALL_R_RIFLE, true }, - { ACT_COVER_WALL_L, ACT_COVER_WALL_L_RIFLE, true }, - { ACT_COVER_WALL_LOW_R, ACT_COVER_WALL_LOW_R_RIFLE, true }, - { ACT_COVER_WALL_LOW_L, ACT_COVER_WALL_LOW_L_RIFLE, true }, + { ACT_COVER_WALL_R, ACT_COVER_WALL_R_RIFLE, false }, + { ACT_COVER_WALL_L, ACT_COVER_WALL_L_RIFLE, false }, + { ACT_COVER_WALL_LOW_R, ACT_COVER_WALL_LOW_R_RIFLE, false }, + { ACT_COVER_WALL_LOW_L, ACT_COVER_WALL_LOW_L_RIFLE, false }, #endif };