From: Wuzzy <wuzzy2@mail.ru>
Date: Sat, 11 Apr 2020 23:50:40 +0000 (+0200)
Subject: Play 'player_jump' when player jumps (#9373)
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=a24d3b360048bde87113d435ab0cfef78851153c;p=oweals%2Fminetest.git

Play 'player_jump' when player jumps (#9373)
---

diff --git a/doc/lua_api.txt b/doc/lua_api.txt
index 1a9aad344..dff6c728e 100644
--- a/doc/lua_api.txt
+++ b/doc/lua_api.txt
@@ -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_falling_damage`: Played when the local player takes
    damage by falling (gain = 0.5)
+ * `player_jump`: Played when the local player jumps
  * `default_dig_<groupname>`: Default node digging sound
    (see node sound definition for details)
 
diff --git a/src/client/game.cpp b/src/client/game.cpp
index 06e76d170..ac6045190 100644
--- a/src/client/game.cpp
+++ b/src/client/game.cpp
@@ -266,6 +266,7 @@ class SoundMaker
 public:
 	bool makes_footstep_sound;
 	float m_player_step_timer;
+	float m_player_jump_timer;
 
 	SimpleSoundSpec m_player_step_sound;
 	SimpleSoundSpec m_player_leftpunch_sound;
@@ -275,7 +276,8 @@ public:
 		m_sound(sound),
 		m_ndef(ndef),
 		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)
 	{
 		SoundMaker *sm = (SoundMaker *)data;
@@ -302,7 +312,8 @@ public:
 
 	static void playerJump(MtEvent *e, void *data)
 	{
-		//SoundMaker *sm = (SoundMaker*)data;
+		SoundMaker *sm = (SoundMaker *)data;
+		sm->playPlayerJump();
 	}
 
 	static void cameraPunchLeft(MtEvent *e, void *data)
@@ -351,6 +362,7 @@ public:
 	void step(float dtime)
 	{
 		m_player_step_timer -= dtime;
+		m_player_jump_timer -= dtime;
 	}
 };