diff --git a/source/enemy/nfdutch.cpp b/source/enemy/nfdutch.cpp index 33465b442..2b1e9a203 100644 --- a/source/enemy/nfdutch.cpp +++ b/source/enemy/nfdutch.cpp @@ -226,6 +226,11 @@ void CNpcFlyingDutchmanEnemy::processClose( int _frames ) { case FLYING_DUTCHMAN_GOTO_PLAYER: { + if ( m_soundId == NOT_PLAYING ) + { + m_soundId = (int) CSoundMediator::playSfx( m_data[m_type].moveSfx, true ); + } + if ( !m_animPlaying ) { m_animPlaying = true; @@ -385,6 +390,11 @@ void CNpcFlyingDutchmanEnemy::processClose( int _frames ) { if ( m_timerTimer > 0 ) { + if ( m_soundId == NOT_PLAYING ) + { + m_soundId = (int) CSoundMediator::playSfx( m_data[m_type].moveSfx, true ); + } + if ( !m_animPlaying ) { m_animNo = m_data[m_type].moveAnim; @@ -681,6 +691,7 @@ void CNpcFlyingDutchmanEnemy::render() DVECTOR &renderPos=getRenderPos(); SprFrame = m_actorGfx->Render(renderPos,m_animNo,( m_frame >> 8 ),m_reversed); + setShadeTex(SprFrame,0); setSemiTrans( SprFrame, true ); SprFrame->tpage|=1<<5; m_actorGfx->RotateScale( SprFrame, renderPos, 0, 4096, 4096 ); diff --git a/source/enemy/nghost.cpp b/source/enemy/nghost.cpp index 1b668664e..8bb92db55 100644 --- a/source/enemy/nghost.cpp +++ b/source/enemy/nghost.cpp @@ -35,6 +35,7 @@ void CNpcGhostEnemy::render() DVECTOR &renderPos=getRenderPos(); SprFrame = m_actorGfx->Render(renderPos,m_animNo,( m_frame >> 8 ),m_reversed); + setShadeTex(SprFrame,0); setSemiTrans( SprFrame, true ); m_actorGfx->RotateScale( SprFrame, renderPos, m_drawRotation, 4096, 4096 ); diff --git a/source/enemy/npcdata.cpp b/source/enemy/npcdata.cpp index 4638ec1b5..1bbd5116e 100644 --- a/source/enemy/npcdata.cpp +++ b/source/enemy/npcdata.cpp @@ -889,7 +889,7 @@ CNpcEnemy::NPC_DATA CNpcEnemy::m_data[NPC_UNIT_TYPE_MAX] = false, false, CSoundMediator::NUM_SFXIDS, - CSoundMediator::NUM_SFXIDS, + CSoundMediator::SFX_ANEMONE_MOVE, true, }, diff --git a/source/platform/pdual.cpp b/source/platform/pdual.cpp index 7b0e6c11b..5f84fe369 100644 --- a/source/platform/pdual.cpp +++ b/source/platform/pdual.cpp @@ -211,6 +211,11 @@ void CNpcDualPlatform::processMovement( int _frames ) 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; DVECTOR slaveMove; diff --git a/source/platform/pgbubble.cpp b/source/platform/pgbubble.cpp index ff648c81b..fe1e85914 100644 --- a/source/platform/pgbubble.cpp +++ b/source/platform/pgbubble.cpp @@ -62,7 +62,7 @@ void CNpcGeyserBubblePlatform::processMovement( int _frames ) 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 ) { - m_soundId = (int) CSoundMediator::playSfx( CSoundMediator::SFX_BALLOON_POP, true ); + m_soundId = (int) CSoundMediator::playSfx( CSoundMediator::SFX_BALLOON_POP, true, true ); } } } diff --git a/source/player/player.cpp b/source/player/player.cpp index a5c82ccf3..35d8280fa 100644 --- a/source/player/player.cpp +++ b/source/player/player.cpp @@ -1740,6 +1740,7 @@ void CPlayer::setAnimNo(int _animNo) void CPlayer::springPlayerUp(int _springHeight) { m_currentPlayerModeClass->springPlayerUp(_springHeight); + CSoundMediator::playSfx( CSoundMediator::SFX_BALL_BLOB_ATTACK ); } /*----------------------------------------------------------------------