From: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Date: Thu, 27 Oct 2011 09:50:05 +0000 (+0300)
Subject: No material by default. Feels most correct
X-Git-Tag: xonotic-v0.6.0~35^2~18^2~132
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=52196e6cf3f6e36be3d5d4349552af20677bbe12;p=xonotic%2Fxonotic-data.pk3dir.git

No material by default. Feels most correct
---

diff --git a/defaultXonotic.cfg b/defaultXonotic.cfg
index a5bf4d680..76be8f9cb 100644
--- a/defaultXonotic.cfg
+++ b/defaultXonotic.cfg
@@ -558,7 +558,7 @@ seta menu_sandbox_edit_frame 0
 seta menu_sandbox_edit_scale 1
 seta menu_sandbox_edit_physics 1
 seta menu_sandbox_edit_force 1
-seta menu_sandbox_edit_material 1
+seta menu_sandbox_edit_material 0
 
 alias menu_showsandboxtools "menu_cmd directmenu SandboxTools"
 bind f7 menu_showsandboxtools
diff --git a/qcsrc/server/mutators/sandbox.qc b/qcsrc/server/mutators/sandbox.qc
index ff311788c..310b90fda 100644
--- a/qcsrc/server/mutators/sandbox.qc
+++ b/qcsrc/server/mutators/sandbox.qc
@@ -1,6 +1,7 @@
 .string object_clipboard;
 .float material;
 
+const float MATERIAL_NONE = 0;
 const float MATERIAL_METAL = 1;
 const float MATERIAL_STONE = 2;
 const float MATERIAL_WOOD = 3;
@@ -72,7 +73,7 @@ entity sandbox_SpawnObject()
 	e.movetype = MOVETYPE_TOSS;
 	e.frame = 0;
 	e.skin = 0;
-	e.material = MATERIAL_METAL;
+	e.material = MATERIAL_NONE;
 
 	e.touch = sandbox_Object_Touch;