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

Fix dynamic interactions using "their_" keyvalues always assuming separate sequence names

Browse Source
This commit is contained in:
ALLEN-PC\acj30 2024-03-13 13:59:41 -05:00 committed by Blixibon
parent e954f00f79
commit b59214ca72
1 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -14895,22 +14895,39 @@ void CAI_BaseNPC::ParseScriptedNPCInteractions(void)
else if (!Q_strncmp(szName, "their_", 6)) else if (!Q_strncmp(szName, "their_", 6))
{ {
const char *szTheirName = szName + 6; const char *szTheirName = szName + 6;
sInteraction.bHasSeparateSequenceNames = true;
if (!Q_strncmp(szTheirName, "entry_sequence", 14)) if (!Q_strncmp(szTheirName, "entry_sequence", 14))
{
sInteraction.bHasSeparateSequenceNames = true;
sInteraction.sTheirPhases[SNPCINT_ENTRY].iszSequence = AllocPooledString(szValue); sInteraction.sTheirPhases[SNPCINT_ENTRY].iszSequence = AllocPooledString(szValue);
}
else if (!Q_strncmp(szTheirName, "entry_activity", 14)) else if (!Q_strncmp(szTheirName, "entry_activity", 14))
{
sInteraction.bHasSeparateSequenceNames = true;
sInteraction.sTheirPhases[SNPCINT_ENTRY].iActivity = GetOrRegisterActivity(szValue); sInteraction.sTheirPhases[SNPCINT_ENTRY].iActivity = GetOrRegisterActivity(szValue);
}
else if (!Q_strncmp(szTheirName, "sequence", 8)) else if (!Q_strncmp(szTheirName, "sequence", 8))
{
sInteraction.bHasSeparateSequenceNames = true;
sInteraction.sTheirPhases[SNPCINT_SEQUENCE].iszSequence = AllocPooledString(szValue); sInteraction.sTheirPhases[SNPCINT_SEQUENCE].iszSequence = AllocPooledString(szValue);
}
else if (!Q_strncmp(szTheirName, "activity", 8)) else if (!Q_strncmp(szTheirName, "activity", 8))
{
sInteraction.bHasSeparateSequenceNames = true;
sInteraction.sTheirPhases[SNPCINT_SEQUENCE].iActivity = GetOrRegisterActivity(szValue); sInteraction.sTheirPhases[SNPCINT_SEQUENCE].iActivity = GetOrRegisterActivity(szValue);
}
else if (!Q_strncmp(szTheirName, "exit_sequence", 13)) else if (!Q_strncmp(szTheirName, "exit_sequence", 13))
{
sInteraction.bHasSeparateSequenceNames = true;
sInteraction.sTheirPhases[SNPCINT_EXIT].iszSequence = AllocPooledString(szValue); sInteraction.sTheirPhases[SNPCINT_EXIT].iszSequence = AllocPooledString(szValue);
}
else if (!Q_strncmp(szTheirName, "exit_activity", 13)) else if (!Q_strncmp(szTheirName, "exit_activity", 13))
{
sInteraction.bHasSeparateSequenceNames = true;
sInteraction.sTheirPhases[SNPCINT_EXIT].iActivity = GetOrRegisterActivity(szValue); sInteraction.sTheirPhases[SNPCINT_EXIT].iActivity = GetOrRegisterActivity(szValue);
}
// Add anything else to our miscellaneous criteria // Add anything else to our miscellaneous criteria
else else