From: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Date: Wed, 26 Oct 2011 14:24:24 +0000 (+0300)
Subject: Add stone and wood sounds to the code. Also no need to return if material isn't set.
X-Git-Tag: xonotic-v0.6.0~35^2~18^2~145
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=ad2c267ac1170dfe81fd9aca29985f584fb3777d;p=xonotic%2Fxonotic-data.pk3dir.git

Add stone and wood sounds to the code. Also no need to return if material isn't set.
---

diff --git a/qcsrc/server/mutators/sandbox.qc b/qcsrc/server/mutators/sandbox.qc
index 72830d58a..fd61d2693 100644
--- a/qcsrc/server/mutators/sandbox.qc
+++ b/qcsrc/server/mutators/sandbox.qc
@@ -29,14 +29,17 @@ void sandbox_EditObject_Scale(entity e, float f)
 
 void sandbox_Object_Touch()
 {
-	if(!self.material)
-		return;
-
 	switch(self.material)
 	{
 		case MATERIAL_METAL:
 			sound(self, CH_TRIGGER, strcat("object/impact_metal_", ftos(ceil(random() * 5)) , ".ogg"), VOL_BASE, ATTN_NORM);
 			break;
+		case MATERIAL_STONE:
+			sound(self, CH_TRIGGER, strcat("object/impact_stone_", ftos(ceil(random() * 5)) , ".ogg"), VOL_BASE, ATTN_NORM);
+			break;
+		case MATERIAL_WOOD:
+			sound(self, CH_TRIGGER, strcat("object/impact_wood_", ftos(ceil(random() * 5)) , ".ogg"), VOL_BASE, ATTN_NORM);
+			break;
 		default:
 			break;
 	}
@@ -361,6 +364,8 @@ MUTATOR_DEFINITION(sandbox)
 		for (i = 1; i <= 5; i++)
 		{
 			precache_sound(strcat("objects/impact_metal_", ftos(i), ".ogg"));
+			precache_sound(strcat("objects/impact_stone_", ftos(i), ".ogg"));
+			precache_sound(strcat("objects/impact_wood_", ftos(i), ".ogg"));
 		}
 	}