MapBase/source-sdk-2013-mapbase
1
0
Fork 0
mirror of https://github.com/mapbase-source/source-sdk-2013.git synced 2025-01-27 06:07:56 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix ai_dynint_always_enabled bypassing misc. criteria

Browse Source
This commit is contained in:
ALLEN-PC\acj30 2024-02-25 18:30:36 -06:00 committed by Blixibon
parent 72bd5fe948
commit b19f329d5f
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
sp/src/game/server/ai_basenpc.cpp
View File

@ -15890,12 +15890,11 @@ bool CAI_BaseNPC::InteractionIsAllowed( CAI_BaseNPC *pOtherNPC, ScriptedNPCInter
if (pOtherNPC->Classify() == CLASS_PLAYER_ALLY_VITAL)
return false;
// This convar allows all NPCs to perform Mapbase interactions for both testing and player fun.
if (ai_dynint_always_enabled.GetBool() && m_iDynamicInteractionsAllowed != TRS_FALSE)
return true;
if (m_iDynamicInteractionsAllowed == TRS_FALSE)
return false;
// m_iDynamicInteractionsAllowed == TRS_FALSE case is already handled in CanRunAScriptedNPCInteraction().
if (pInteraction->iFlags & SCNPC_FLAG_MAPBASE_ADDITION && m_iDynamicInteractionsAllowed == TRS_NONE)
// To maintain existing behavior, Mapbase additions require either explicit TRS_YES or ai_dynint_always_enabled.
if (pInteraction->iFlags & SCNPC_FLAG_MAPBASE_ADDITION && m_iDynamicInteractionsAllowed == TRS_NONE && !ai_dynint_always_enabled.GetBool())
return false;
// Test misc. criteria here since some of it may not have been valid on initial calculation, but could be now