From 3ba3e38bf31744e292de95022956007340dc9701 Mon Sep 17 00:00:00 2001 From: Charles Date: Wed, 25 Jul 2001 15:25:54 +0000 Subject: [PATCH] --- source/friend/fgary.cpp | 15 +++++++++++++++ source/friend/fgary.h | 1 + 2 files changed, 16 insertions(+) diff --git a/source/friend/fgary.cpp b/source/friend/fgary.cpp index 0eabcbf8f..d67dd89af 100644 --- a/source/friend/fgary.cpp +++ b/source/friend/fgary.cpp @@ -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; } } diff --git a/source/friend/fgary.h b/source/friend/fgary.h index 27472cc81..d258ec603 100644 --- a/source/friend/fgary.h +++ b/source/friend/fgary.h @@ -42,6 +42,7 @@ protected: s16 m_drawRotation; int m_soundId; u8 m_obstructed; + u8 m_garyMeow; }; #endif \ No newline at end of file