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-12 20:15:10 +00:00
parent 948f32ea2e
commit e399f8ad11
8 changed files with 52 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
source/enemy/npcdata.cpp
View file

@ -421,7 +421,6 @@ CNpcEnemy::NPC_DATA CNpcEnemy::m_data[NPC_UNIT_TYPE_MAX] =
false, false,
true, true,
CSoundMediator::SFX_PRICKLY_BUG_DEFEATED, CSoundMediator::SFX_PRICKLY_BUG_DEFEATED,
//CSoundMediator::NUM_SFXIDS,
CSoundMediator::SFX_PRICKLY_BUG_MOVE, CSoundMediator::SFX_PRICKLY_BUG_MOVE,
true, true,
}, },
@ -525,7 +524,7 @@ CNpcEnemy::NPC_DATA CNpcEnemy::m_data[NPC_UNIT_TYPE_MAX] =
false, false,
false, false,
true, true,
CSoundMediator::NUM_SFXIDS, CSoundMediator::SFX_PRICKLY_BUG_DEFEATED,
CSoundMediator::NUM_SFXIDS, CSoundMediator::NUM_SFXIDS,
true, true,
}, },

8
source/enemy/nsdart.cpp
View file

@ -141,10 +141,9 @@ bool CNpcSquidDartEnemy::processSensor()
if( m_soundId != NOT_PLAYING ) if( m_soundId != NOT_PLAYING )
{ {
CSoundMediator::stopAndUnlockSfx( (xmPlayingId) m_soundId ); CSoundMediator::stopAndUnlockSfx( (xmPlayingId) m_soundId );
m_soundId = NOT_PLAYING;
} }
m_soundId = (int) CSoundMediator::playSfx( CSoundMediator::SFX_SQUIDDART_ATTACK, true );
return( true ); return( true );
} }
else else
@ -179,6 +178,11 @@ void CNpcSquidDartEnemy::processClose( int _frames )
} }
Pos.vx += movement; Pos.vx += movement;
if( m_soundId != NOT_PLAYING )
{
m_soundId = (int) CSoundMediator::playSfx( CSoundMediator::SFX_SQUIDDART_ATTACK, true );
}
} }
else else
{ {

17
source/hazard/hbbarrel.cpp
View file

@ -169,6 +169,16 @@ void CNpcBouncingBarrelHazard::processMovement( int _frames )
Pos.vy = m_lastWaypoint.vy - ( ( abs( nextWaypoint.vy - m_lastWaypoint.vy ) * rsin( sineVal ) ) >> 12 ); Pos.vy = m_lastWaypoint.vy - ( ( abs( nextWaypoint.vy - m_lastWaypoint.vy ) * rsin( sineVal ) ) >> 12 );
} }
int groundHeight = CGameScene::getCollision()->getHeightFromGround( Pos.vx, Pos.vy, 16 );
if ( groundHeight < 8 )
{
if ( m_soundId == NOT_PLAYING )
{
m_soundId = (int) CSoundMediator::playSfx( CSoundMediator::SFX_HAZARD__ACORN_LAND, true );
}
}
} }
} }
@ -215,6 +225,13 @@ void CNpcBouncingBarrelHazard::collidedWith( CThing *_thisThing )
player->takeDamage( DAMAGE__HIT_ENEMY ); player->takeDamage( DAMAGE__HIT_ENEMY );
} }
if( m_soundId != NOT_PLAYING )
{
CSoundMediator::stopAndUnlockSfx( (xmPlayingId) m_soundId );
}
m_soundId = (int) CSoundMediator::playSfx( CSoundMediator::SFX_HAZARD__ACORN_LAND, true );
m_hitPlayer = true; m_hitPlayer = true;
m_speed = -5; m_speed = -5;
} }

7
source/hazard/hfalling.cpp
View file

@ -211,6 +211,13 @@ void CNpcFallingHazard::collidedWith( CThing *_thisThing )
m_speed = -5; m_speed = -5;
m_bounceDir = getRnd() % 2; m_bounceDir = getRnd() % 2;
if( m_soundId != NOT_PLAYING )
{
CSoundMediator::stopAndUnlockSfx( (xmPlayingId) m_soundId );
}
m_soundId = (int) CSoundMediator::playSfx( CSoundMediator::SFX_HAZARD__ACORN_LAND, true );
m_bouncePos = Pos; m_bouncePos = Pos;
break; break;

2
source/platform/pbranch.cpp
View file

@ -122,6 +122,7 @@ void CNpcBranchPlatform::processMovement( int _frames )
if ( m_angularVelocity > 6 && newAngle < -20 ) if ( m_angularVelocity > 6 && newAngle < -20 )
{ {
player->springPlayerUp(); player->springPlayerUp();
CSoundMediator::playSfx(CSoundMediator::SFX_SPONGEBOB_BUTTBOUNCE);
} }
} }
else else
@ -129,6 +130,7 @@ void CNpcBranchPlatform::processMovement( int _frames )
if ( m_angularVelocity < -6 && newAngle > 20 ) if ( m_angularVelocity < -6 && newAngle > 20 )
{ {
player->springPlayerUp(); player->springPlayerUp();
CSoundMediator::playSfx(CSoundMediator::SFX_SPONGEBOB_BUTTBOUNCE);
} }
} }

16
source/platform/pjellfsh.cpp
View file

@ -50,6 +50,7 @@ void CNpcJellyfishPlatform::postInit()
m_vertScale = 0; m_vertScale = 0;
m_dipCount = 0; m_dipCount = 0;
m_dipOffset = 0; m_dipOffset = 0;
m_contactTimeout = 0;
} }
//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
@ -85,6 +86,16 @@ void CNpcJellyfishPlatform::collidedWith( CThing *_thisThing )
if( height == 0 ) if( height == 0 )
{ {
m_contact = true; m_contact = true;
if ( m_contactTimeout <= 0 )
{
if ( m_soundId == NOT_PLAYING )
{
m_soundId = (int) CSoundMediator::playSfx( CSoundMediator::SFX_LAND_ON_JELLYFISH, true );
}
}
m_contactTimeout = 2;
} }
} }
} }
@ -115,6 +126,11 @@ void CNpcJellyfishPlatform::think( int _frames )
m_vertScale += 10; m_vertScale += 10;
}*/ }*/
if ( m_contactTimeout > 0 )
{
m_contactTimeout--;
}
if ( m_contact ) if ( m_contact )
{ {
if ( m_dipCount < GameState::getOneSecondInFrames() ) if ( m_dipCount < GameState::getOneSecondInFrames() )

1
source/platform/pjellfsh.h
View file

@ -29,6 +29,7 @@ protected:
s32 m_vertScale; s32 m_vertScale;
u8 m_dipCount; u8 m_dipCount;
s32 m_dipOffset; s32 m_dipOffset;
s32 m_contactTimeout;
}; };
#endif #endif

2
source/player/psduck.cpp
View file

@ -74,6 +74,8 @@ void CPlayerStateSoakUp::enter(CPlayerModeBase *_playerMode)
_playerMode->zeroMoveVelocity(); _playerMode->zeroMoveVelocity();
_playerMode->setAnimNo(ANIM_SPONGEBOB_DONOTDRAW); _playerMode->setAnimNo(ANIM_SPONGEBOB_DONOTDRAW);
m_breatheDelayFrames=0; m_breatheDelayFrames=0;
CSoundMediator::playSfx(CSoundMediator::SFX_SPLASH);
} }