]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Add stone and wood sounds to the code. Also no need to return if material isn't set.
authorMircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Wed, 26 Oct 2011 14:24:24 +0000 (17:24 +0300)
committerMircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Wed, 26 Oct 2011 14:24:24 +0000 (17:24 +0300)
qcsrc/server/mutators/sandbox.qc

index 72830d58a479a9ae6a427afb555475f68e599cdf..fd61d2693bafd82d83b8ef3c1bea6243e36f024e 100644 (file)
@@ -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"));
                }
        }