Skip to content
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

Set activity before SetYawSpeed so it has the right activity #78

Merged
merged 1 commit into from
May 6, 2019
Merged

Set activity before SetYawSpeed so it has the right activity #78

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
13 changes: 7 additions & 6 deletions dlls/monsters.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1208,13 +1208,19 @@ void CBaseMonster::SetActivity( Activity NewActivity )

iSequence = LookupActivity( NewActivity );

Activity OldActivity = m_Activity;
m_Activity = NewActivity; // Go ahead and set this so it doesn't keep trying when the anim is not present

// In case someone calls this with something other than the ideal activity
m_IdealActivity = m_Activity;

// Set to the desired anim, or default anim if the desired is not present
if( iSequence > ACTIVITY_NOT_AVAILABLE )
{
if( pev->sequence != iSequence || !m_fSequenceLoops )
{
// don't reset frame between walk and run
if( !( m_Activity == ACT_WALK || m_Activity == ACT_RUN ) || !( NewActivity == ACT_WALK || NewActivity == ACT_RUN ) )
if( !( OldActivity == ACT_WALK || OldActivity == ACT_RUN ) || !( NewActivity == ACT_WALK || NewActivity == ACT_RUN ) )
pev->frame = 0;
}

Expand All @@ -1228,11 +1234,6 @@ void CBaseMonster::SetActivity( Activity NewActivity )
ALERT( at_aiconsole, "%s has no sequence for act:%d\n", STRING( pev->classname ), NewActivity );
pev->sequence = 0; // Set to the reset anim (if it's there)
}

m_Activity = NewActivity; // Go ahead and set this so it doesn't keep trying when the anim is not present

// In case someone calls this with something other than the ideal activity
m_IdealActivity = m_Activity;
}

//=========================================================
Expand Down