Play 'player_jump' when player jumps (#9373)

Wuzzy2 · web-flow · commit a24d3b360048 · 2020-04-12T00:50:40.000+01:00
diff --git 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
@@ -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 @@ class SoundMaker
 		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 @@ class SoundMaker
 		}
 	}
 
+	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 @@ class SoundMaker
 
 	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 @@ class SoundMaker
 	void step(float dtime)
 	{
 		m_player_step_timer -= dtime;
+		m_player_jump_timer -= dtime;
 	}
 };
 

Original file line number	Diff line number	Diff line change
`@@ -266,6 +266,7 @@ class SoundMaker`
`266`	`266`	`public:`
`267`	`267`	`bool makes_footstep_sound;`
`268`	`268`	`float m_player_step_timer;`
	`269`	`+ float m_player_jump_timer;`
`269`	`270`
`270`	`271`	`SimpleSoundSpec m_player_step_sound;`
`271`	`272`	`SimpleSoundSpec m_player_leftpunch_sound;`
`@@ -275,7 +276,8 @@ class SoundMaker`
`275`	`276`	`m_sound(sound),`
`276`	`277`	`m_ndef(ndef),`
`277`	`278`	`makes_footstep_sound(true),`
`278`		`- m_player_step_timer(0)`
	`279`	`+ m_player_step_timer(0.0f),`
	`280`	`+ m_player_jump_timer(0.0f)`
`279`	`281`	`{`
`280`	`282`	`}`
`281`	`283`
`@@ -288,6 +290,14 @@ class SoundMaker`
`288`	`290`	`}`
`289`	`291`	`}`
`290`	`292`
	`293`	`+ void playPlayerJump()`
	`294`	`+ {`
	`295`	`+ if (m_player_jump_timer <= 0.0f) {`
	`296`	`+ m_player_jump_timer = 0.2f;`
	`297`	`+ m_sound->playSound(SimpleSoundSpec("player_jump", 0.5f), false);`
	`298`	`+ }`
	`299`	`+ }`
	`300`	`+`
`291`	`301`	`static void viewBobbingStep(MtEvent e, void data)`
`292`	`302`	`{`
`293`	`303`	`SoundMaker sm = (SoundMaker )data;`
`@@ -302,7 +312,8 @@ class SoundMaker`
`302`	`312`
`303`	`313`	`static void playerJump(MtEvent e, void data)`
`304`	`314`	`{`
`305`		`- //SoundMaker sm = (SoundMaker)data;`
	`315`	`+ SoundMaker sm = (SoundMaker )data;`
	`316`	`+ sm->playPlayerJump();`
`306`	`317`	`}`
`307`	`318`
`308`	`319`	`static void cameraPunchLeft(MtEvent e, void data)`
`@@ -351,6 +362,7 @@ class SoundMaker`
`351`	`362`	`void step(float dtime)`
`352`	`363`	`{`
`353`	`364`	`m_player_step_timer -= dtime;`
	`365`	`+ m_player_jump_timer -= dtime;`
`354`	`366`	`}`
`355`	`367`	`};`
`356`	`368`