Skip to content

NPC dynamic interaction improvements and fixes #270

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Blixibon merged 9 commits into from
Feb 4, 2024
Merged

NPC dynamic interaction improvements and fixes #270

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
fd149ff
Add new dynamic interaction keyvalues and utilities
Blixibon Jan 3, 2024
a88091a
Enhancements for interactions which don't test angles (including a ne…
Blixibon Jan 3, 2024
869ec6d
Improved debugging for dynamic interaction distance
Blixibon Jan 3, 2024
dc8fe60
Fix dynamic interaction problems caused by walkframe sequence movement
Blixibon Jan 3, 2024
5910394
Fixes and hacks for HL2 NPCs performing dynamic interactions
Blixibon Jan 3, 2024
959332b
Fix related interactions having greater delays stomped out
Blixibon Jan 3, 2024
3861c6a
Fix semicolon
Blixibon Jan 3, 2024
1467557
Fix "their_" misc criteria not being registered
Blixibon Jan 5, 2024
8b7c695
Fix AE_ZOMBIE_POPHEADCRAB using inaccurate headcrab release position
Blixibon Jan 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 17 additions & 0 deletions sp/src/game/server/ai_activity.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,23 @@ int CAI_BaseNPC::GetActivityID(const char* actName)
return m_pActivitySR->GetStringID(actName);
}

#ifdef MAPBASE
//-----------------------------------------------------------------------------
// Purpose: Gets an activity ID or registers a new private one if it doesn't exist
//-----------------------------------------------------------------------------
int CAI_BaseNPC::GetOrRegisterActivity( const char *actName )
{
int actID = GetActivityID( actName );
if (actID == ACT_INVALID)
{
actID = ActivityList_RegisterPrivateActivity( actName );
AddActivityToSR( actName, actID );
}

return actID;
}
#endif

#define ADD_ACTIVITY_TO_SR(activityname) AddActivityToSR(#activityname,activityname)

//-----------------------------------------------------------------------------
Expand Down
Loading