replace some sound files, add water dig/place sounds, and make footsteps faster when running
This commit is contained in:
parent
64dfdc4f9f
commit
a7be88ace9
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
|
@ -309,7 +309,7 @@ void Camera::update(LocalPlayer* player, f32 frametime, v2u32 screensize)
|
||||||
) {
|
) {
|
||||||
// Start animation
|
// Start animation
|
||||||
m_view_bobbing_state = 1;
|
m_view_bobbing_state = 1;
|
||||||
m_view_bobbing_speed = MYMIN(speed.getLength(), 40);
|
m_view_bobbing_speed = MYMIN(speed.getLength(), 60);
|
||||||
}else if (m_view_bobbing_state == 1) {
|
}else if (m_view_bobbing_state == 1) {
|
||||||
// Stop animation
|
// Stop animation
|
||||||
m_view_bobbing_state = 2;
|
m_view_bobbing_state = 2;
|
||||||
|
|
|
@ -2412,5 +2412,14 @@ void Client::playPlaceSound(content_t c)
|
||||||
if (volume > 100.0)
|
if (volume > 100.0)
|
||||||
volume = 100.0;
|
volume = 100.0;
|
||||||
volume /= 100.0;
|
volume /= 100.0;
|
||||||
m_sound->playSound("place",false,volume);
|
if (c == CONTENT_IGNORE) {
|
||||||
|
c = getPointedContent();
|
||||||
|
}
|
||||||
|
switch (content_features(c).type) {
|
||||||
|
case CMT_LIQUID:
|
||||||
|
m_sound->playSound("liquid-place",false,volume);
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
m_sound->playSound("place",false,volume);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -32,32 +32,26 @@ void init_sounds(ISoundManager *sound)
|
||||||
{
|
{
|
||||||
// walking
|
// walking
|
||||||
// CMT_DIRT
|
// CMT_DIRT
|
||||||
sound->loadSound("dirt-walk","dirt_footstep.1.ogg");
|
sound->loadSound("dirt-walk","step_dirt.1.ogg");
|
||||||
sound->loadSound("dirt-walk","dirt_footstep.2.ogg");
|
sound->loadSound("dirt-walk","step_dirt.2.ogg");
|
||||||
sound->loadSound("dirt-walk","dirt_footstep.3.ogg");
|
|
||||||
sound->loadSound("dirt-walk","dirt_footstep.4.ogg");
|
|
||||||
// CMT_STONE
|
// CMT_STONE
|
||||||
sound->loadSound("stone-walk","stone_footstep.1.ogg");
|
sound->loadSound("stone-walk","step_stone.1.ogg");
|
||||||
sound->loadSound("stone-walk","stone_footstep.2.ogg");
|
sound->loadSound("stone-walk","step_stone.2.ogg");
|
||||||
sound->loadSound("stone-walk","stone_footstep.3.ogg");
|
sound->loadSound("stone-walk","step_stone.3.ogg");
|
||||||
sound->loadSound("stone-walk","stone_footstep.4.ogg");
|
sound->loadSound("stone-walk","step_stone.4.ogg");
|
||||||
// CMT_PLANT
|
// CMT_PLANT
|
||||||
sound->loadSound("plant-walk","plant_footstep.1.ogg");
|
sound->loadSound("plant-walk","step_plant.1.ogg");
|
||||||
sound->loadSound("plant-walk","plant_footstep.2.ogg");
|
sound->loadSound("plant-walk","step_plant.2.ogg");
|
||||||
sound->loadSound("plant-walk","plant_footstep.3.ogg");
|
|
||||||
sound->loadSound("plant-walk","plant_footstep.4.ogg");
|
|
||||||
// CMT_LIQUID
|
// CMT_LIQUID
|
||||||
sound->loadSound("liquid-walk","liquid_footstep.1.ogg");
|
sound->loadSound("liquid-walk","step_liquid.1.ogg");
|
||||||
sound->loadSound("liquid-walk","liquid_footstep.2.ogg");
|
sound->loadSound("liquid-walk","step_liquid.2.ogg");
|
||||||
sound->loadSound("liquid-walk","liquid_footstep.3.ogg");
|
|
||||||
sound->loadSound("liquid-walk","liquid_footstep.4.ogg");
|
|
||||||
// CMT_WOOD
|
// CMT_WOOD
|
||||||
sound->loadSound("wood-walk","wood_footstep.1.ogg");
|
sound->loadSound("wood-walk","step_wood.1.ogg");
|
||||||
sound->loadSound("wood-walk","wood_footstep.2.ogg");
|
sound->loadSound("wood-walk","step_wood.2.ogg");
|
||||||
sound->loadSound("wood-walk","wood_footstep.3.ogg");
|
sound->loadSound("wood-walk","step_wood.3.ogg");
|
||||||
sound->loadSound("wood-walk","wood_footstep.4.ogg");
|
sound->loadSound("wood-walk","step_wood.4.ogg");
|
||||||
// CMT_GLASS
|
// CMT_GLASS
|
||||||
sound->loadSound("glass-walk","glass_footstep.1.ogg");
|
sound->loadSound("glass-walk","step_glass.1.ogg");
|
||||||
|
|
||||||
// digging
|
// digging
|
||||||
// CMT_DIRT
|
// CMT_DIRT
|
||||||
|
@ -85,6 +79,7 @@ void init_sounds(ISoundManager *sound)
|
||||||
// CMT_STONE
|
// CMT_STONE
|
||||||
// CMT_PLANT
|
// CMT_PLANT
|
||||||
// CMT_LIQUID
|
// CMT_LIQUID
|
||||||
|
sound->loadSound("liquid-place","place_liquid.1.ogg");
|
||||||
// CMT_WOOD
|
// CMT_WOOD
|
||||||
// CMT_GLASS
|
// CMT_GLASS
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue