Mirrors/SBSPSS
1
0
Fork 0
Code Releases Activity

Browse Source
This commit is contained in:
Charles 2001-06-01 16:30:37 +00:00
parent 61308f18f6
commit 1ed6b3c05f
19 changed files with 60 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
source/enemy/nbblob.cpp
View File

@ -83,6 +83,11 @@ void CNpcBallBlobEnemy::processMovement( int _frames )
}
moveY = groundHeight;
if ( m_data[m_type].moveSfx < CSoundMediator::NUM_SFXIDS )
{
CSoundMediator::playSfx( m_data[m_type].moveSfx );
}
}
// deal with horizontal

2
source/enemy/nfskull.cpp
View File

@ -67,6 +67,8 @@ void CNpcFlamingSkullEnemy::processClose( int _frames )
s32 distX, distY;
s32 distXSqr, distYSqr;
CSoundMediator::playSfx( CSoundMediator::SFX_FLAMING_SKULL_ATTACK );
if ( m_state == FLAMING_SKULL_ATTACK )
{
processGenericGetUserDist( _frames, &distX, &distY );

2
source/enemy/nmjfish.cpp
View File

@ -259,6 +259,8 @@ void CNpcMotherJellyfishEnemy::processClose( int _frames )
m_controlFunc = NPC_CONTROL_MOVEMENT;
m_state = MOTHER_JELLYFISH_RETURN_TO_START_1;
CSoundMediator::playSfx( CSoundMediator::SFX_JELLYFISH_ATTACK );
}
break;

2
source/enemy/npbug.cpp
View File

@ -53,7 +53,7 @@ void CNpcPricklyBugEnemy::processMovementModifier( int _frames, s32 distX, s32 d
// sound
CSoundMediator::playSfx( CSoundMediator::SFX_PRICKLY_BUG_MOVE );
//CSoundMediator::playSfx( CSoundMediator::SFX_PRICKLY_BUG_MOVE );
}
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////

23
source/enemy/npcdata.cpp
View File

@ -410,7 +410,8 @@ CNpcEnemy::NPC_DATA CNpcEnemy::m_data[NPC_UNIT_TYPE_MAX] =
false,
true,
CSoundMediator::SFX_PRICKLY_BUG_DEFEATED,
CSoundMediator::NUM_SFXIDS,
//CSoundMediator::NUM_SFXIDS,
CSoundMediator::SFX_PRICKLY_BUG_MOVE,
},
{ // NPC_SEA_SNAKE
@ -435,7 +436,7 @@ CNpcEnemy::NPC_DATA CNpcEnemy::m_data[NPC_UNIT_TYPE_MAX] =
false,
true,
CSoundMediator::NUM_SFXIDS,
CSoundMediator::NUM_SFXIDS,
CSoundMediator::SFX_SEASNAKE_MOVE,
},
{ // NPC_PUFFA_FISH
@ -460,7 +461,7 @@ CNpcEnemy::NPC_DATA CNpcEnemy::m_data[NPC_UNIT_TYPE_MAX] =
false,
true,
CSoundMediator::NUM_SFXIDS,
CSoundMediator::NUM_SFXIDS,
CSoundMediator::SFX_PUFFAFISH_MOVE,
},
{ // NPC_ANGLER_FISH
@ -485,7 +486,7 @@ CNpcEnemy::NPC_DATA CNpcEnemy::m_data[NPC_UNIT_TYPE_MAX] =
false,
true,
CSoundMediator::NUM_SFXIDS,
CSoundMediator::NUM_SFXIDS,
CSoundMediator::SFX_ANGLER_FISH_MOVE,
},
{ // NPC_HERMIT_CRAB
@ -535,7 +536,7 @@ CNpcEnemy::NPC_DATA CNpcEnemy::m_data[NPC_UNIT_TYPE_MAX] =
false,
true,
CSoundMediator::NUM_SFXIDS,
CSoundMediator::NUM_SFXIDS,
CSoundMediator::SFX_HAZARD__MINE,
},
{ // NPC_BOOGER_MONSTER
@ -735,7 +736,7 @@ CNpcEnemy::NPC_DATA CNpcEnemy::m_data[NPC_UNIT_TYPE_MAX] =
false,
true,
CSoundMediator::NUM_SFXIDS,
CSoundMediator::NUM_SFXIDS,
CSoundMediator::SFX_GHOST,
},
{ // NPC_GHOST_PIRATE
@ -784,8 +785,8 @@ CNpcEnemy::NPC_DATA CNpcEnemy::m_data[NPC_UNIT_TYPE_MAX] =
false,
false,
true,
CSoundMediator::NUM_SFXIDS,
CSoundMediator::NUM_SFXIDS,
CSoundMediator::SFX_FLAMING_SKULL_DEFEATED,
CSoundMediator::SFX_FLAMING_SKULL_MOVE,
},
{ // NPC_SHARK_MAN
@ -884,8 +885,8 @@ CNpcEnemy::NPC_DATA CNpcEnemy::m_data[NPC_UNIT_TYPE_MAX] =
false,
false,
false,
CSoundMediator::NUM_SFXIDS,
CSoundMediator::NUM_SFXIDS,
CSoundMediator::SFX_JELLYFISH_DEFEATED,
CSoundMediator::SFX_JELLYFISH_MOVE,
},
{ // NPC_SUB_SHARK
@ -1035,7 +1036,7 @@ CNpcEnemy::NPC_DATA CNpcEnemy::m_data[NPC_UNIT_TYPE_MAX] =
false,
true,
CSoundMediator::NUM_SFXIDS,
CSoundMediator::NUM_SFXIDS,
CSoundMediator::SFX_BALL_BLOB_MOVE,
},
{ // NPC_SHELL

5
source/enemy/nssnake.cpp
View File

@ -246,6 +246,11 @@ void CNpcSeaSnakeEnemy::processMovement( int _frames )
DVECTOR oldPos = Pos;
u8 skipCounter;
if ( m_data[m_type].moveSfx < CSoundMediator::NUM_SFXIDS )
{
CSoundMediator::playSfx( m_data[m_type].moveSfx );
}
processGenericFixedPathMove( _frames, &moveX, &moveY, &moveVel, &moveDist );
Pos.vx += moveX;

1
source/enemy/nsstomp.cpp
View File

@ -55,6 +55,7 @@ bool CNpcSkullStomperEnemy::processSensor()
{
m_controlFunc = NPC_CONTROL_CLOSE;
m_extendDir = EXTEND_DOWN;
CSoundMediator::playSfx( CSoundMediator::SFX_SKULL_ATTACK );
return( true );
}

4
source/friend/fgary.cpp
View File

@ -83,6 +83,8 @@ void CNpcGaryFriend::think( int _frames )
if ( m_started )
{
CSoundMediator::playSfx( CSoundMediator::SFX_GARY_DE_SNAIL );
Pos.vx += multiplier * _frames;
}
}
@ -107,6 +109,8 @@ void CNpcGaryFriend::think( int _frames )
{
if ( m_started )
{
CSoundMediator::playSfx( CSoundMediator::SFX_GARY_DE_SNAIL );
Pos.vx += multiplier * _frames;
}
}

3
source/hazard/hazard.h
View File

@ -30,6 +30,9 @@
#include "gfx\actor.h"
#endif
#ifndef __SOUND_SOUND_H__
#include "sound\sound.h"
#endif
class CNpcHazard : public CHazardThing
{

1
source/hazard/hbwheel.cpp
View File

@ -39,6 +39,7 @@ void CNpcBigWheelHazard::processMovement( int _frames )
{
m_rotation += 5 * _frames;
m_rotation &= 4095;
CSoundMediator::playSfx( CSoundMediator::SFX_WORLD_OBJECT__BIG_WHEEL );
}
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////

2
source/hazard/hcsaw.cpp
View File

@ -39,6 +39,8 @@ void CNpcCircularSawHazard::processMovement( int _frames )
{
m_rotation += 256 * _frames;
m_rotation &= 4095;
CSoundMediator::playSfx( CSoundMediator::SFX_SAW );
}
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////

2
source/hazard/hfalling.cpp
View File

@ -132,6 +132,8 @@ void CNpcFallingHazard::processMovement( int _frames )
if ( groundHeight < yMovement )
{
CSoundMediator::playSfx( CSoundMediator::SFX_HAZARD__ACORN_LAND );
// colliding with ground
Pos.vy += groundHeight;

3
source/hazard/hfirebal.cpp
View File

@ -96,6 +96,7 @@ void CNpcFireballHazard::processMovement( int _frames )
m_isActive = false;
m_timerActive = true;
m_timer = ( m_respawnRate - 1 ) * GameState::getOneSecondInFrames();
CSoundMediator::playSfx( CSoundMediator::SFX_HAZARD__FIREBALL_LAND );
return;
}
@ -114,5 +115,7 @@ void CNpcFireballHazard::processTimer( int _frames )
{
m_timerActive = false;
m_isActive = true;
CSoundMediator::playSfx( CSoundMediator::SFX_HAZARD__FIREBALL_LAUNCH );
}
}

2
source/hazard/hmower.cpp
View File

@ -39,6 +39,8 @@ void CNpcMowerHazard::processMovement( int _frames )
{
m_rotation += 256 * _frames;
m_rotation &= 4095;
CSoundMediator::playSfx( CSoundMediator::SFX_SAW );
}
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////

2
source/hazard/hrckshrd.cpp
View File

@ -58,6 +58,7 @@ void CNpcRockShardHazard::processMovement( int _frames )
{
Pos.vx = m_base.vx + ( -3 + ( getRnd() % 7 ) );
Pos.vy = m_base.vy + ( -3 + ( getRnd() % 7 ) );
CSoundMediator::playSfx( CSoundMediator::SFX_HAZARD__STALACTITE_RATTLE );
}
}
else
@ -75,6 +76,7 @@ void CNpcRockShardHazard::processMovement( int _frames )
m_isActive = false;
m_timerActive = true;
m_timer = ( m_respawnRate - 1 ) * GameState::getOneSecondInFrames();
CSoundMediator::playSfx( CSoundMediator::SFX_HAZARD__STALACTITE_LAND );
}
else
{

5
source/hazard/hrrock.cpp
View File

@ -64,6 +64,11 @@ void CNpcRollingRockHazard::processMovement( int _frames )
}
else
{
if ( !m_jump )
{
CSoundMediator::playSfx( CSoundMediator::SFX_ROLLING_ROCK );
}
if ( distX )
{
// move along ground

2
source/hazard/hsaw.cpp
View File

@ -45,6 +45,8 @@ void CNpcSawbladeHazard::processMovement( int _frames )
s16 headingToTarget = m_npcPath.think( Pos, &pathComplete, &waypointChange, &xDist, &yDist );
CSoundMediator::playSfx( CSoundMediator::SFX_SAW );
if ( !pathComplete )
{
s16 decDir, incDir, moveDist;

1
source/platform/pgeyser.cpp
View File

@ -134,6 +134,7 @@ void CNpcGeyserPlatform::processTimer( int _frames )
m_isFiring = true;
Pos = m_base;
m_state = GEYSER_RISING;
CSoundMediator::playSfx( CSoundMediator::SFX_WORLD_OBJECT__GEYSER );
}
}
}

6
source/platform/pseesaw.cpp
View File

@ -104,7 +104,11 @@ void CNpcSeesawPlatform::processMovement( int _frames )
m_angularVelocity = 0;
}
m_currentAngle = newAngle;
if ( m_currentAngle != newAngle )
{
m_currentAngle = newAngle;
CSoundMediator::playSfx( CSoundMediator::SFX_WORLD_OBJECT__SEESAW );
}
setCollisionAngle( newAngle >> 8 );
}