X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fsv_main.qc;h=3b7d77d58be6ef819dfcd4ae68266588e1ed36fc;hb=3dbc0b5b9ab0f255ec91b8670aeb7cd62218f873;hp=a79f9a473b0638911a9918f2ec78513eab9a0cca;hpb=f66615b722a8527aecfa7a6f2a74bb55204fb16b;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/sv_main.qc b/qcsrc/server/sv_main.qc
index a79f9a473..3b7d77d58 100644
--- a/qcsrc/server/sv_main.qc
+++ b/qcsrc/server/sv_main.qc
@@ -77,6 +77,10 @@ void CreatureFrame (void)
 				if (dm > 0)
 				{
 					Damage (self, world, world, dm, DEATH_FALL, self.origin, '0 0 0');
+					// this must be allowed to cut the normal pain sounds (played after them and on the same channel)
+					// there's no way to detect falling damage and prevent the pain sounds for this to be played instead
+					if(self.health > 0)
+						PlayerSound(playersound_fall, CHAN_PAIN, VOICETYPE_PLAYERSOUND);
 				}
 			}
 
@@ -191,6 +195,7 @@ void StartFrame (void)
 	sv_maxairstrafespeed = cvar("sv_maxairstrafespeed");
 	sv_airstrafeaccel_qw = cvar("sv_airstrafeaccel_qw");
 	sv_aircontrol = cvar("sv_aircontrol");
+	sv_aircontrol_penalty = cvar("sv_aircontrol_penalty");
 	sv_aircontrol_power = cvar("sv_aircontrol_power");
 	sv_warsowbunny_airforwardaccel = cvar("sv_warsowbunny_airforwardaccel");
 	sv_warsowbunny_accel = cvar("sv_warsowbunny_accel");