BRNSystems/minetest
1
0
Fork 0
forked from Mirrorlandia_minetest/minetest
Code Pull Requests 1 Activity

Play 'player_jump' when player jumps (#9373)

Browse Source
This commit is contained in:
Wuzzy 2020-04-12 01:50:40 +02:00 committed by GitHub
parent 3833396cfa
commit a24d3b3600
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
doc/lua_api.txt
View File

@ -897,6 +897,7 @@ These sound files are played back by the engine if provided.
* `player_damage`: Played when the local player takes damage (gain = 0.5) * `player_damage`: Played when the local player takes damage (gain = 0.5)
* `player_falling_damage`: Played when the local player takes * `player_falling_damage`: Played when the local player takes
damage by falling (gain = 0.5) damage by falling (gain = 0.5)
* `player_jump`: Played when the local player jumps
* `default_dig_<groupname>`: Default node digging sound * `default_dig_<groupname>`: Default node digging sound
(see node sound definition for details) (see node sound definition for details)

16
src/client/game.cpp
View File

@ -266,6 +266,7 @@ class SoundMaker
public: public:
bool makes_footstep_sound; bool makes_footstep_sound;
float m_player_step_timer; float m_player_step_timer;
float m_player_jump_timer;
SimpleSoundSpec m_player_step_sound; SimpleSoundSpec m_player_step_sound;
SimpleSoundSpec m_player_leftpunch_sound; SimpleSoundSpec m_player_leftpunch_sound;
@ -275,7 +276,8 @@ public:
m_sound(sound), m_sound(sound),
m_ndef(ndef), m_ndef(ndef),
makes_footstep_sound(true), makes_footstep_sound(true),
m_player_step_timer(0) m_player_step_timer(0.0f),
m_player_jump_timer(0.0f)
{ {
} }
@ -288,6 +290,14 @@ public:
} }
} }
void playPlayerJump()
{
if (m_player_jump_timer <= 0.0f) {
m_player_jump_timer = 0.2f;
m_sound->playSound(SimpleSoundSpec("player_jump", 0.5f), false);
}
}
static void viewBobbingStep(MtEvent *e, void *data) static void viewBobbingStep(MtEvent *e, void *data)
{ {
SoundMaker *sm = (SoundMaker *)data; SoundMaker *sm = (SoundMaker *)data;
@ -302,7 +312,8 @@ public:
static void playerJump(MtEvent *e, void *data) static void playerJump(MtEvent *e, void *data)
{ {
//SoundMaker *sm = (SoundMaker*)data; SoundMaker *sm = (SoundMaker *)data;
sm->playPlayerJump();
} }
static void cameraPunchLeft(MtEvent *e, void *data) static void cameraPunchLeft(MtEvent *e, void *data)
@ -351,6 +362,7 @@ public:
void step(float dtime) void step(float dtime)
{ {
m_player_step_timer -= dtime; m_player_step_timer -= dtime;
m_player_jump_timer -= dtime;
} }
}; };