Mirrors/SBSPSS
1
0
Fork 0
Code Releases Activity

Browse Source
This commit is contained in:
Charles 2001-07-28 16:07:56 +00:00
parent 58b8952233
commit 18d9b79905
2 changed files with 35 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
source/friend/fgary.cpp
View File

@ -36,6 +36,8 @@
#endif #endif
u8 CNpcGaryFriend::m_garySpeech;
//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
void CNpcGaryFriend::postInit() void CNpcGaryFriend::postInit()
@ -43,15 +45,19 @@ void CNpcGaryFriend::postInit()
CNpcFriend::postInit(); CNpcFriend::postInit();
m_started = false; m_started = false;
m_startMoving = false;
m_fallDeath = false; m_fallDeath = false;
m_drawRotation = 0; m_drawRotation = 0;
m_obstructed = false; m_obstructed = false;
m_garySB = false;
m_garyMeow = false; m_garyMeow = false;
m_soundId = (int) NOT_PLAYING; m_soundId = (int) NOT_PLAYING;
setCollisionSize( 40, 27 ); setCollisionSize( 40, 27 );
setCollisionCentreOffset( 0, -14 ); setCollisionCentreOffset( 0, -14 );
m_garySpeech = false;
} }
//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
@ -81,11 +87,15 @@ void CNpcGaryFriend::think( int _frames )
} }
} }
if ( m_started ) if ( m_garySB && !m_startMoving )
{ {
if ( !m_garyMeow ) if ( !CSoundMediator::isSpeechPlaying() )
{ {
if ( !CSoundMediator::isSpeechPlaying() ) if ( m_garyMeow )
{
m_startMoving = true;
}
else
{ {
m_garyMeow = true; m_garyMeow = true;
CSoundMediator::playSpeech( SPEECH_029 ); CSoundMediator::playSpeech( SPEECH_029 );
@ -113,7 +123,7 @@ void CNpcGaryFriend::think( int _frames )
} }
else else
{ {
if ( m_started ) if ( m_startMoving )
{ {
m_animNo = ANIM_GARY_SLITHER; m_animNo = ANIM_GARY_SLITHER;
} }
@ -232,7 +242,7 @@ void CNpcGaryFriend::think( int _frames )
Pos.vy += groundHeight; Pos.vy += groundHeight;
if ( m_started ) if ( m_startMoving )
{ {
if ( canRender() && m_soundId == NOT_PLAYING ) if ( canRender() && m_soundId == NOT_PLAYING )
{ {
@ -264,7 +274,7 @@ void CNpcGaryFriend::think( int _frames )
} }
else else
{ {
if ( m_started ) if ( m_startMoving )
{ {
if ( m_soundId == NOT_PLAYING ) if ( m_soundId == NOT_PLAYING )
{ {
@ -378,11 +388,23 @@ void CNpcGaryFriend::start()
{ {
if ( !m_started ) if ( !m_started )
{ {
m_started = true;
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 ); m_started = true;
if ( !m_garySpeech )
{
m_garySpeech = true;
m_garyMeow = false;
m_garySB = true;
CSoundMediator::playSpeech( SPEECH_028 );
}
else
{
m_startMoving = true;
m_garySB = false;
}
} }
} }
@ -393,9 +415,11 @@ void CNpcGaryFriend::stop()
if ( m_started ) if ( m_started )
{ {
m_started = false; m_started = false;
m_startMoving = false;
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; m_garyMeow = false;
m_garySB = false;
} }
} }

3
source/friend/fgary.h
View File

@ -37,12 +37,15 @@ public:
protected: protected:
DVECTOR m_triggerPos; DVECTOR m_triggerPos;
u8 m_started; u8 m_started;
u8 m_startMoving;
u8 m_fallDeath; u8 m_fallDeath;
s16 m_speed; s16 m_speed;
s16 m_drawRotation; s16 m_drawRotation;
int m_soundId; int m_soundId;
u8 m_obstructed; u8 m_obstructed;
u8 m_garySB;
u8 m_garyMeow; u8 m_garyMeow;
static u8 m_garySpeech;
}; };
#endif #endif