MapBase/source-sdk-2013-mapbase
1
0
Fork 0
mirror of https://github.com/mapbase-source/source-sdk-2013.git synced 2025-02-05 02:00:34 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fixes

Browse Source
This commit is contained in:
Peter Covington 2022-04-18 18:12:40 -04:00
parent e77180547d
commit ee46bc4bd1
2 changed files with 23 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sp/src/game/server/mapbase/custom_weapon_factory.cpp
View File

@ -15,7 +15,7 @@ CCustomWeaponSystem::CCustomWeaponSystem() : CAutoGameSystem("CustomWeaponFactor
void CCustomWeaponSystem::LevelInitPreEntity()
{
AddManifestFile(GLOBAL_WEAPONS_MANIFEST);
LoadCustomWeaponsManifest(GLOBAL_WEAPONS_MANIFEST);
// Check for a generic "mapname_manifest.txt" file and load it.
if (filesystem->FileExists(AUTOLOADED_MANIFEST_FILE, "GAME"))

28
sp/src/game/server/mapbase/weapon_custom_hl2.cpp
View File

@ -89,14 +89,30 @@ acttable_t CHLCustomWeaponMelee::m_acttable[] =
{ ACT_DISARM, ACT_DISARM_MELEE, false },
// Readiness activities (not aiming)
{ ACT_IDLE_RELAXED, ACT_IDLE_MELEE, false },//never aims
{ ACT_IDLE_STIMULATED, ACT_IDLE_MELEE, false },
{ ACT_IDLE_AGITATED, ACT_IDLE_ANGRY_MELEE, false },//always aims
{ ACT_IDLE_RELAXED, ACT_IDLE_MELEE, false },//never aims
{ ACT_IDLE_STIMULATED, ACT_IDLE_MELEE, false },
{ ACT_IDLE_AGITATED, ACT_IDLE_ANGRY_MELEE, false },//always aims
{ ACT_WALK_RELAXED, ACT_WALK_MELEE, false },//never aims
{ ACT_WALK_STIMULATED, ACT_WALK_MELEE, false },
{ ACT_WALK_AGITATED, ACT_WALK_MELEE, false },//always aims
{ ACT_RUN_RELAXED, ACT_RUN_MELEE, false },//never aims
{ ACT_RUN_STIMULATED, ACT_RUN_MELEE, false },
{ ACT_RUN_AGITATED, ACT_RUN_MELEE, false },//always aims
// Readiness activities (aiming)
{ ACT_IDLE_AIM_RELAXED, ACT_IDLE_MELEE, false },//never aims
{ ACT_IDLE_AIM_STIMULATED, ACT_IDLE_ANGRY_MELEE, false },
{ ACT_IDLE_AIM_AGITATED, ACT_IDLE_ANGRY_MELEE, false },//always aims
{ ACT_IDLE_AIM_RELAXED, ACT_IDLE_MELEE, false },//never aims
{ ACT_IDLE_AIM_STIMULATED, ACT_IDLE_ANGRY_MELEE, false },
{ ACT_IDLE_AIM_AGITATED, ACT_IDLE_ANGRY_MELEE, false },//always aims
{ ACT_WALK_AIM_RELAXED, ACT_WALK_MELEE, false },//never aims
{ ACT_WALK_AIM_STIMULATED, ACT_WALK_MELEE, false },
{ ACT_WALK_AIM_AGITATED, ACT_WALK_MELEE, false },//always aims
{ ACT_RUN_AIM_RELAXED, ACT_RUN_MELEE, false },//never aims
{ ACT_RUN_AIM_STIMULATED, ACT_RUN_MELEE, false },
{ ACT_RUN_AIM_AGITATED, ACT_RUN_MELEE, false },//always aims
//End readiness activities
#else
{ ACT_IDLE, ACT_IDLE_ANGRY_MELEE, false },