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

NSMonster: Add InAnimation() method. Also prohibit movement when in an animation.

Browse source
This commit is contained in:
Marco Cawthorne 2022-07-18 09:22:18 -07:00
parent 0d2e0627d4
commit 0ae901f5e1
Signed by: eukara
GPG key ID: CE2032F0A2882A22
4 changed files with 24 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/gs-entbase/shared/NSMonster.h
View file

@ -271,6 +271,7 @@ class NSMonster:NSNavAI
virtual int(void) AnimRun;
virtual void(float) AnimPlay;
virtual void(void) AnimationUpdate;
virtual bool(void) InAnimation;
/* states */
virtual void(monsterState_e, monsterState_e) StateChanged;

18
src/gs-entbase/shared/NSMonster.qc
View file

@ -91,6 +91,12 @@ NSMonster::AnimPlay(float seq)
m_flAnimTime = time + frameduration(modelindex, frame);
}
bool
NSMonster::InAnimation(void)
{
return (m_flAnimTime > time) ? true : false;
}
void
NSMonster::Sound(string msg)
{
@ -100,7 +106,7 @@ NSMonster::Sound(string msg)
void
NSMonster::Gib(void)
{
takedamage = DAMAGE_NO;
SetTakedamage(DAMAGE_NO);
FX_GibHuman(origin, vectoangles(origin - g_dmg_eAttacker.origin), g_dmg_iDamage * 2.0f);
Hide();
}
@ -594,8 +600,14 @@ NSMonster::Physics(void)
AnimationUpdate();
}
CheckRoute();
WalkRoute();
if (InAnimation() == false) {
CheckRoute();
WalkRoute();
} else {
input_movevalues = [0,0,0];
}
hitcontentsmaski = CONTENTBITS_MONSTER;
if (CanCrouch())

8
src/gs-entbase/shared/NSNavAI.qc
View file

@ -206,5 +206,11 @@ NSNavAI::ClearRoute(void)
void
NSNavAI::NSNavAI(void)
{
#ifdef SERVER
m_iNodes = 0;
m_iCurNode = -1;
m_pRoute = __NULL__;
m_vecLastNode = [0,0,0];
m_vecTurnAngle = [0,0,0];
#endif
}

2
src/server/entry.qc
View file

@ -639,7 +639,7 @@ ConsoleCmd(string cmd)
makevectors(pl.v_angle);
if (unit.identity == 1) {
NSEntity ent = (NSEntity)unit
NSEntity ent = (NSEntity)unit;
ent.Respawn();
}
traceline(pl.origin, pl.origin + (v_forward * 1024), MOVE_NORMAL, pl);