This commit is contained in:
Charles 2001-07-23 21:43:57 +00:00
parent a83d9e3833
commit 7b796200df
6 changed files with 21 additions and 3 deletions

View File

@ -226,6 +226,11 @@ void CNpcFlyingDutchmanEnemy::processClose( int _frames )
{ {
case FLYING_DUTCHMAN_GOTO_PLAYER: case FLYING_DUTCHMAN_GOTO_PLAYER:
{ {
if ( m_soundId == NOT_PLAYING )
{
m_soundId = (int) CSoundMediator::playSfx( m_data[m_type].moveSfx, true );
}
if ( !m_animPlaying ) if ( !m_animPlaying )
{ {
m_animPlaying = true; m_animPlaying = true;
@ -385,6 +390,11 @@ void CNpcFlyingDutchmanEnemy::processClose( int _frames )
{ {
if ( m_timerTimer > 0 ) if ( m_timerTimer > 0 )
{ {
if ( m_soundId == NOT_PLAYING )
{
m_soundId = (int) CSoundMediator::playSfx( m_data[m_type].moveSfx, true );
}
if ( !m_animPlaying ) if ( !m_animPlaying )
{ {
m_animNo = m_data[m_type].moveAnim; m_animNo = m_data[m_type].moveAnim;
@ -681,6 +691,7 @@ void CNpcFlyingDutchmanEnemy::render()
DVECTOR &renderPos=getRenderPos(); DVECTOR &renderPos=getRenderPos();
SprFrame = m_actorGfx->Render(renderPos,m_animNo,( m_frame >> 8 ),m_reversed); SprFrame = m_actorGfx->Render(renderPos,m_animNo,( m_frame >> 8 ),m_reversed);
setShadeTex(SprFrame,0);
setSemiTrans( SprFrame, true ); setSemiTrans( SprFrame, true );
SprFrame->tpage|=1<<5; SprFrame->tpage|=1<<5;
m_actorGfx->RotateScale( SprFrame, renderPos, 0, 4096, 4096 ); m_actorGfx->RotateScale( SprFrame, renderPos, 0, 4096, 4096 );

View File

@ -35,6 +35,7 @@ void CNpcGhostEnemy::render()
DVECTOR &renderPos=getRenderPos(); DVECTOR &renderPos=getRenderPos();
SprFrame = m_actorGfx->Render(renderPos,m_animNo,( m_frame >> 8 ),m_reversed); SprFrame = m_actorGfx->Render(renderPos,m_animNo,( m_frame >> 8 ),m_reversed);
setShadeTex(SprFrame,0);
setSemiTrans( SprFrame, true ); setSemiTrans( SprFrame, true );
m_actorGfx->RotateScale( SprFrame, renderPos, m_drawRotation, 4096, 4096 ); m_actorGfx->RotateScale( SprFrame, renderPos, m_drawRotation, 4096, 4096 );

View File

@ -889,7 +889,7 @@ CNpcEnemy::NPC_DATA CNpcEnemy::m_data[NPC_UNIT_TYPE_MAX] =
false, false,
false, false,
CSoundMediator::NUM_SFXIDS, CSoundMediator::NUM_SFXIDS,
CSoundMediator::NUM_SFXIDS, CSoundMediator::SFX_ANEMONE_MOVE,
true, true,
}, },

View File

@ -211,6 +211,11 @@ void CNpcDualPlatform::processMovement( int _frames )
m_extension += extensionChange; m_extension += extensionChange;
if ( extensionChange )
{
m_soundId = (int) CSoundMediator::playSfx( CSoundMediator::SFX_WORLD_OBJECT__ROTATING_PLATFORM, true, true );
}
Pos.vy = m_base.vy + m_extension; Pos.vy = m_base.vy + m_extension;
DVECTOR slaveMove; DVECTOR slaveMove;

View File

@ -62,7 +62,7 @@ void CNpcGeyserBubblePlatform::processMovement( int _frames )
if ( m_soundId == NOT_PLAYING ) if ( m_soundId == NOT_PLAYING )
{ {
m_soundId = (int) CSoundMediator::playSfx( CSoundMediator::SFX_BALLOON_POP, true ); m_soundId = (int) CSoundMediator::playSfx( CSoundMediator::SFX_BALLOON_POP, true, true );
} }
} }
} }
@ -75,7 +75,7 @@ void CNpcGeyserBubblePlatform::processMovement( int _frames )
if ( m_soundId == NOT_PLAYING ) if ( m_soundId == NOT_PLAYING )
{ {
m_soundId = (int) CSoundMediator::playSfx( CSoundMediator::SFX_BALLOON_POP, true ); m_soundId = (int) CSoundMediator::playSfx( CSoundMediator::SFX_BALLOON_POP, true, true );
} }
} }
} }

View File

@ -1740,6 +1740,7 @@ void CPlayer::setAnimNo(int _animNo)
void CPlayer::springPlayerUp(int _springHeight) void CPlayer::springPlayerUp(int _springHeight)
{ {
m_currentPlayerModeClass->springPlayerUp(_springHeight); m_currentPlayerModeClass->springPlayerUp(_springHeight);
CSoundMediator::playSfx( CSoundMediator::SFX_BALL_BLOB_ATTACK );
} }
/*---------------------------------------------------------------------- /*----------------------------------------------------------------------