Skip to content

Allow NPCs to open func_door entities #6

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

Open
OpposingHorse wants to merge 1 commit into
base: expanded
Choose a base branch
from
+16 −1
Open

Allow NPCs to open func_door entities #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 10 additions & 0 deletions sp/src/game/server/ai_basenpc.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13947,6 +13947,16 @@ bool CAI_BaseNPC::OnObstructingDoor( AILocalMoveGoal_t *pMoveGoal,
{
if ( distClear < 0.1 )
{
#ifdef MAPBASE
if ((CapabilitiesGet() & bits_CAP_AUTO_DOORS) && !pDoor->m_bLocked && !pDoor->HasSpawnFlags(SF_DOOR_NONPCS))
{
// Tell the door to open
m_flMoveWaitFinished = OpenDoorAndWait(pDoor);
*pResult = AIMR_OK;
GetNavigator()->NoteOpeningDoor();
}
else
#endif // MAPBASE
*pResult = AIMR_BLOCKED_ENTITY;
}
else
Expand Down
7 changes: 6 additions & 1 deletion sp/src/game/server/ai_navigator.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -494,7 +494,12 @@ class CAI_Navigator : public CAI_Component,
// --------------------------------

virtual AIMoveResult_t MoveEnact( const AILocalMoveGoal_t &baseMove );


#ifdef MAPBASE
public:
void NoteOpeningDoor() { OnNewGoal(); }
#endif // MAPBASE

protected:
// made this virtual so strider can implement hover behavior with a navigator
virtual void MoveCalcBaseGoal( AILocalMoveGoal_t *pMoveGoal);
Expand Down