Play player_damage.ogg when recieving damage and additionally play player_falling_damage.ogg when recieving falling damage

PilzAdam · PilzAdam · commit 2cdf0ff4abaa · 2013-06-12T20:27:06.000Z
diff --git a/src/environment.cpp b/src/environment.cpp
@@ -40,6 +40,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #ifndef SERVER
 #include "clientmap.h"
 #include "localplayer.h"
+#include "event.h"
 #endif
 #include "daynightratio.h"
 #include "map.h"
@@ -2190,8 +2191,11 @@ void ClientEnvironment::step(float dtime)
 		{
 			f32 damage_f = (speed - tolerance)/BS * post_factor;
 			u16 damage = (u16)(damage_f+0.5);
-			if(damage != 0)
+			if(damage != 0){
 				damageLocalPlayer(damage, true);
+				MtEvent *e = new SimpleTriggerEvent("PlayerFallingDamage");
+				m_gamedef->event()->put(e);
+			}
 		}
 	}
 	
diff --git a/src/game.cpp b/src/game.cpp
@@ -729,6 +729,18 @@ class SoundMaker
 		sm->m_sound->playSound(sm->m_ndef->get(nde->n).sound_dug, false);
 	}
 
+	static void playerDamage(MtEvent *e, void *data)
+	{
+		SoundMaker *sm = (SoundMaker*)data;
+		sm->m_sound->playSound(SimpleSoundSpec("player_damage", 0.5), false);
+	}
+
+	static void playerFallingDamage(MtEvent *e, void *data)
+	{
+		SoundMaker *sm = (SoundMaker*)data;
+		sm->m_sound->playSound(SimpleSoundSpec("player_falling_damage", 0.5), false);
+	}
+
 	void registerReceiver(MtEventManager *mgr)
 	{
 		mgr->reg("ViewBobbingStep", SoundMaker::viewBobbingStep, this);
@@ -737,6 +749,8 @@ class SoundMaker
 		mgr->reg("CameraPunchLeft", SoundMaker::cameraPunchLeft, this);
 		mgr->reg("CameraPunchRight", SoundMaker::cameraPunchRight, this);
 		mgr->reg("NodeDug", SoundMaker::nodeDug, this);
+		mgr->reg("PlayerDamage", SoundMaker::playerDamage, this);
+		mgr->reg("PlayerFallingDamage", SoundMaker::playerFallingDamage, this);
 	}
 
 	void step(float dtime)
@@ -2202,6 +2216,9 @@ void the_game(
 					player->hurt_tilt_timer = 1.5;
 					player->hurt_tilt_strength = event.player_damage.amount/2;
 					player->hurt_tilt_strength = rangelim(player->hurt_tilt_strength, 2.0, 10.0);
+
+					MtEvent *e = new SimpleTriggerEvent("PlayerDamage");
+					gamedef->event()->put(e);
 				}
 				else if(event.type == CE_PLAYER_FORCE_MOVE)
 				{

Original file line number	Diff line number	Diff line change
`@@ -40,6 +40,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,`
`40`	`40`	`#ifndef SERVER`
`41`	`41`	`#include "clientmap.h"`
`42`	`42`	`#include "localplayer.h"`
	`43`	`+#include "event.h"`
`43`	`44`	`#endif`
`44`	`45`	`#include "daynightratio.h"`
`45`	`46`	`#include "map.h"`
`@@ -2190,8 +2191,11 @@ void ClientEnvironment::step(float dtime)`
`2190`	`2191`	`{`
`2191`	`2192`	`f32 damage_f = (speed - tolerance)/BS * post_factor;`
`2192`	`2193`	`u16 damage = (u16)(damage_f+0.5);`
`2193`		`- if(damage != 0)`
	`2194`	`+ if(damage != 0){`
`2194`	`2195`	`damageLocalPlayer(damage, true);`
	`2196`	`+ MtEvent *e = new SimpleTriggerEvent("PlayerFallingDamage");`
	`2197`	`+ m_gamedef->event()->put(e);`
	`2198`	`+ }`
`2195`	`2199`	`}`
`2196`	`2200`	`}`
`2197`	`2201`