vera/nuclide
4
0
Fork 0
Code Issues 32 Pull requests Projects Releases Packages Activity

BaseNPC: Don't talk while in sequence.

Browse source
This commit is contained in:
Marco Cawthorne 2020-03-29 11:49:35 +02:00
parent f07600f194
commit d59213834b
1 changed files with 27 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
src/gs-entbase/server/basenpc.cpp
View file

@ -166,6 +166,9 @@ CBaseNPC::Speak(string sentence)
void void
CBaseNPC::TalkPlayerGreet(void) CBaseNPC::TalkPlayerGreet(void)
{ {
if (m_iSequenceState != SEQUENCESTATE_NONE)
return;
if (m_flNextSentence > time) { if (m_flNextSentence > time) {
return; return;
} }
@ -193,6 +196,9 @@ CBaseNPC::TalkPlayerGreet(void)
void void
CBaseNPC::TalkPlayerIdle(void) CBaseNPC::TalkPlayerIdle(void)
{ {
if (m_iSequenceState != SEQUENCESTATE_NONE)
return;
if (spawnflags & MSF_PREDISASTER) { if (spawnflags & MSF_PREDISASTER) {
return; return;
} }
@ -219,6 +225,9 @@ CBaseNPC::TalkPlayerIdle(void)
void void
CBaseNPC::TalkPlayerAsk(void) CBaseNPC::TalkPlayerAsk(void)
{ {
if (m_iSequenceState != SEQUENCESTATE_NONE)
return;
if (spawnflags & MSF_PREDISASTER) { if (spawnflags & MSF_PREDISASTER) {
return; return;
} }
@ -245,6 +254,9 @@ CBaseNPC::TalkPlayerAsk(void)
void void
CBaseNPC::TalkPlayerWounded1(void) CBaseNPC::TalkPlayerWounded1(void)
{ {
if (m_iSequenceState != SEQUENCESTATE_NONE)
return;
if (m_flNextSentence > time) { if (m_flNextSentence > time) {
return; return;
} }
@ -270,6 +282,9 @@ CBaseNPC::TalkPlayerWounded1(void)
void void
CBaseNPC::TalkPlayerWounded2(void) CBaseNPC::TalkPlayerWounded2(void)
{ {
if (m_iSequenceState != SEQUENCESTATE_NONE)
return;
if (m_flNextSentence > time) { if (m_flNextSentence > time) {
return; return;
} }
@ -296,6 +311,9 @@ CBaseNPC::TalkPlayerWounded2(void)
void void
CBaseNPC::TalkPlayerWounded3(void) CBaseNPC::TalkPlayerWounded3(void)
{ {
if (m_iSequenceState != SEQUENCESTATE_NONE)
return;
if (m_flNextSentence > time) { if (m_flNextSentence > time) {
return; return;
} }
@ -318,6 +336,9 @@ CBaseNPC::TalkPlayerWounded3(void)
void void
CBaseNPC::TalkUnfollow(void) CBaseNPC::TalkUnfollow(void)
{ {
if (m_iSequenceState != SEQUENCESTATE_NONE)
return;
Sentence(m_talkUnfollow); Sentence(m_talkUnfollow);
m_flNextSentence = time + 10.0; m_flNextSentence = time + 10.0;
} }
@ -325,6 +346,9 @@ CBaseNPC::TalkUnfollow(void)
void void
CBaseNPC::TalkFollow(void) CBaseNPC::TalkFollow(void)
{ {
if (m_iSequenceState != SEQUENCESTATE_NONE)
return;
Sentence(m_talkFollow); Sentence(m_talkFollow);
m_flNextSentence = time + 10.0; m_flNextSentence = time + 10.0;
} }
@ -332,6 +356,9 @@ CBaseNPC::TalkFollow(void)
void void
CBaseNPC::TalkStopFollow(void) CBaseNPC::TalkStopFollow(void)
{ {
if (m_iSequenceState != SEQUENCESTATE_NONE)
return;
Sentence(m_talkStopFollow); Sentence(m_talkStopFollow);
m_flNextSentence = time + 10.0; m_flNextSentence = time + 10.0;
} }