This commit is contained in:
parent
5132d7ca82
commit
3ba3e38bf3
2 changed files with 16 additions and 0 deletions
|
@ -46,6 +46,7 @@ void CNpcGaryFriend::postInit()
|
|||
m_fallDeath = false;
|
||||
m_drawRotation = 0;
|
||||
m_obstructed = false;
|
||||
m_garyMeow = false;
|
||||
|
||||
m_soundId = (int) NOT_PLAYING;
|
||||
|
||||
|
@ -80,6 +81,18 @@ void CNpcGaryFriend::think( int _frames )
|
|||
}
|
||||
}
|
||||
|
||||
if ( m_started )
|
||||
{
|
||||
if ( !m_garyMeow )
|
||||
{
|
||||
if ( !CSoundMediator::isSpeechPlaying() )
|
||||
{
|
||||
m_garyMeow = false;
|
||||
CSoundMediator::playSpeech( SPEECH_029 );
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if ( m_animPlaying )
|
||||
{
|
||||
s32 frameCount;
|
||||
|
@ -369,6 +382,7 @@ void CNpcGaryFriend::start()
|
|||
m_animNo = ANIM_GARY_SLITHER;
|
||||
m_animPlaying = true;
|
||||
m_frame = 0;
|
||||
CSoundMediator::playSpeech( SPEECH_028 );
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -382,5 +396,6 @@ void CNpcGaryFriend::stop()
|
|||
m_animNo = m_data[m_type].idleAnim;
|
||||
m_animPlaying = true;
|
||||
m_frame = 0;
|
||||
m_garyMeow = false;
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue