From: Mario <mario@smbclan.net>
Date: Mon, 26 Oct 2015 00:43:04 +0000 (+1000)
Subject: Apply the same fix to regular doors
X-Git-Tag: xonotic-v0.8.2~1791
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=ce9243ac43e29bb8f6958bcfc6c5a0456b54f56b;p=xonotic%2Fxonotic-data.pk3dir.git

Apply the same fix to regular doors
---

diff --git a/qcsrc/common/triggers/func/door.qc b/qcsrc/common/triggers/func/door.qc
index 24fc6d64c..921642406 100644
--- a/qcsrc/common/triggers/func/door.qc
+++ b/qcsrc/common/triggers/func/door.qc
@@ -316,7 +316,7 @@ void door_touch()
 	{
 		if (IS_CLIENT(other))
 			centerprint(other, self.owner.message);
-		play2(other, SND(TALK));
+		play2(other, self.owner.noise);
 	}
 #endif
 }
@@ -734,6 +734,9 @@ spawnfunc(func_door)
 	self.effects |= EF_LOWPRECISION;
 	self.classname = "door";
 
+	if(self.noise == "")
+		self.noise = "misc/talk.wav";
+
 	self.blocked = door_blocked;
 	self.use = door_use;