zydronium/SBSPSS
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Browse source
This commit is contained in:
Charles 2001-07-25 15:25:54 +00:00
parent 5132d7ca82
commit 3ba3e38bf3
2 changed files with 16 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

15
source/friend/fgary.cpp
View file

@ -46,6 +46,7 @@ void CNpcGaryFriend::postInit()
m_fallDeath = false; m_fallDeath = false;
m_drawRotation = 0; m_drawRotation = 0;
m_obstructed = false; m_obstructed = false;
m_garyMeow = false;
m_soundId = (int) NOT_PLAYING; 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 ) if ( m_animPlaying )
{ {
s32 frameCount; s32 frameCount;
@ -369,6 +382,7 @@ void CNpcGaryFriend::start()
m_animNo = ANIM_GARY_SLITHER; m_animNo = ANIM_GARY_SLITHER;
m_animPlaying = true; m_animPlaying = true;
m_frame = 0; m_frame = 0;
CSoundMediator::playSpeech( SPEECH_028 );
} }
} }
@ -382,5 +396,6 @@ void CNpcGaryFriend::stop()
m_animNo = m_data[m_type].idleAnim; m_animNo = m_data[m_type].idleAnim;
m_animPlaying = true; m_animPlaying = true;
m_frame = 0; m_frame = 0;
m_garyMeow = false;
} }
} }

1
source/friend/fgary.h
View file

@ -42,6 +42,7 @@ protected:
s16 m_drawRotation; s16 m_drawRotation;
int m_soundId; int m_soundId;
u8 m_obstructed; u8 m_obstructed;
u8 m_garyMeow;
}; };
#endif #endif