MapBase/source-sdk-2013-mapbase
1
0
Fork 0
mirror of https://github.com/mapbase-source/source-sdk-2013.git synced 2024-12-26 23:05:30 +03:00
Code Issues Packages Projects Releases Wiki Activity

Added sequence check and backup activity fallback to companion NPC readiness activities

Browse Source
This commit is contained in:
Blixibon 2021-11-04 08:45:10 -05:00
parent 2c55c6cea7
commit a2c2fe09d5
1 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
sp/src/game/server/hl2/npc_playercompanion.cpp
View File

@ -1650,6 +1650,19 @@ Activity CNPC_PlayerCompanion::TranslateActivityReadiness( Activity activity )
continue; continue;
} }
#ifdef MAPBASE
// If we don't have the readiness activity we selected and there's no backup activity available, break the loop and return the base act.
bool bRequired;
if ( !HaveSequenceForActivity( actremap.mappedActivity ) && !HaveSequenceForActivity( Weapon_TranslateActivity( actremap.mappedActivity, &bRequired ) ) )
{
Activity backupAct = Weapon_BackupActivity( actremap.mappedActivity, bRequired );
if ( backupAct != actremap.mappedActivity )
return backupAct;
else
break;
}
#endif
// We've successfully passed all criteria for remapping this // We've successfully passed all criteria for remapping this
return actremap.mappedActivity; return actremap.mappedActivity;
} }