Archive/openmohaa
0
0
Fork 0
mirror of https://github.com/openmoh/openmohaa.git synced 2025-05-08 19:48:08 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Actor improvements p2

Browse source
This commit is contained in:
mohabhassan 2019-06-29 23:43:30 +02:00
parent da28beeab4
commit 32fddb163f
37 changed files with 718 additions and 710 deletions
Download patch file Download diff file Expand all files Collapse all files

36
code/game/actor_idle.cpp
View file

@ -42,6 +42,7 @@ void Actor::Begin_Idle
)
{
glbs.Printf("Begin_Idle\n");
m_csMood = m_csIdleMood;
ClearPath();
}
@ -67,7 +68,6 @@ void Actor::IdleThink
)
{
//FIXME: revision
IdlePoint();
IdleLook();
if (PathExists() && PathComplete())
@ -78,28 +78,23 @@ void Actor::IdleThink
{
SetPathToNotBlockSentient((Sentient *)G_GetEntity(0));
}
if (!PathExists())
if (PathExists())
{
Anim_Idle();
IdleTurn();
PostThink(true);
Anim_WalkTo(2);
if (PathDist() <= 128.0)
IdleTurn();
else
FaceMotion();
}
else
{
//FIXME: macros
Anim_WalkTo(2);
if (PathDist() <= 128.0)
{
IdleTurn();
PostThink(true);
}
else
{
FaceMotion();
}
Anim_Idle();
IdleTurn();
}
PostThink(true);
}
@ -116,12 +111,9 @@ bool Actor::PassesTransitionConditions_Idle
)
{
glbs.Printf("PassesTransitionConditions_Idle\n");
if (m_bEnableEnemy)
{
if (level.inttime > m_iEnemyCheckTime + 500)
UpdateEnemyInternal();
}
UpdateEnemy(500);
if (m_bLockThinkState)
return false;