Skip to content

Move E:Z2 player to followup-capable expresser #317

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
1upD merged 1 commit into from
Feb 20, 2025
Merged

Move E:Z2 player to followup-capable expresser #317

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
2 changes: 1 addition & 1 deletion sp/src/game/server/ez2/ez2_player.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1601,7 +1601,7 @@ bool CEZ2_Player::GetGameTextSpeechParams( hudtextparms_t &params )
//-----------------------------------------------------------------------------
CAI_Expresser *CEZ2_Player::CreateExpresser(void)
{
m_pExpresser = new CAI_Expresser(this);
m_pExpresser = new CAI_ExpresserWithFollowup(this);
if (!m_pExpresser)
return NULL;

Expand Down
2 changes: 2 additions & 0 deletions sp/src/game/server/ez2/ez2_player.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,8 @@ class CEZ2_Player : public CAI_ExpresserHost<CHL2_Player>, public CGameEventList
virtual CAI_Expresser * CreateExpresser(void);
virtual CAI_Expresser * GetExpresser() { return m_pExpresser; }

bool IsAllowedToSpeakFollowup( AIConcept_t concept ) { return IsAllowedToSpeak( concept ); }

bool GetGameTextSpeechParams( hudtextparms_t &params );

void ModifyOrAppendDamageCriteria(AI_CriteriaSet & set, const CTakeDamageInfo & info, bool bPlayer = true);
Expand Down
Loading