From: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Date: Wed, 26 Oct 2011 13:44:16 +0000 (+0300)
Subject: Allow objects without a material
X-Git-Tag: xonotic-v0.6.0~35^2~18^2~148
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=0cd168336bae636c572d55b24fce0b9f3fd0528d;p=xonotic%2Fxonotic-data.pk3dir.git

Allow objects without a material
---

diff --git a/qcsrc/menu/xonotic/dialog_sandboxtools.c b/qcsrc/menu/xonotic/dialog_sandboxtools.c
index 301ca92d3..f4dd6b980 100644
--- a/qcsrc/menu/xonotic/dialog_sandboxtools.c
+++ b/qcsrc/menu/xonotic/dialog_sandboxtools.c
@@ -49,9 +49,9 @@ void XonoticSandboxToolsDialog_fill(entity me)
 	me.TR(me);
 		me.TD(me, 1, 0.5, makeXonoticCommandButton(_("Set material:"), '0 0 0', "sandbox edit_object material $menu_sandbox_edit_material", 0));
 		me.TD(me, 1, 1.5, e = makeXonoticTextSlider("menu_sandbox_edit_material"));
-			e.addValue(e, _("metal"), "0");
-			e.addValue(e, _("stone"), "1");
-			e.addValue(e, _("wood"), "2");
+			e.addValue(e, _("metal"), "1");
+			e.addValue(e, _("stone"), "2");
+			e.addValue(e, _("wood"), "3");
 			e.configureXonoticTextSliderValues(e);
 		me.TD(me, 1, 0.5, makeXonoticCommandButton(_("Set physics:"), '0 0 0', "sandbox edit_object physics $menu_sandbox_edit_physics", 0));
 		me.TD(me, 1, 0.5, e = makeXonoticRadioButton(1, "menu_sandbox_edit_physics", "0", _("Static")));
diff --git a/qcsrc/server/mutators/sandbox.qc b/qcsrc/server/mutators/sandbox.qc
index 9c0f0e704..72830d58a 100644
--- a/qcsrc/server/mutators/sandbox.qc
+++ b/qcsrc/server/mutators/sandbox.qc
@@ -1,9 +1,9 @@
 .string object_clipboard;
 .float material;
 
-const float MATERIAL_METAL = 0;
-const float MATERIAL_STONE = 1;
-const float MATERIAL_WOOD = 2;
+const float MATERIAL_METAL = 1;
+const float MATERIAL_STONE = 2;
+const float MATERIAL_WOOD = 3;
 
 entity sandbox_EditObject_Get()
 {
@@ -29,6 +29,9 @@ void sandbox_EditObject_Scale(entity e, float f)
 
 void sandbox_Object_Touch()
 {
+	if(!self.material)
+		return;
+
 	switch(self.material)
 	{
 		case MATERIAL_METAL:
@@ -100,7 +103,7 @@ MUTATOR_HOOKFUNCTION(sandbox_PlayerCommand)
 				print_to(self, "^3scale value ^7- changes object scale. 0.5 is half size and 2 is double size");
 				print_to(self, "^3physics value ^7- object physics, 0 = static, 1 = movable, 2 = physical");
 				print_to(self, "^3force value ^7- amount of force applied to objects that are shot");
-				print_to(self, "^3material value ^7- sets the material of the object. Valid materials are: 0 (metal), 1 (stone), 2 (wood)");
+				print_to(self, "^3material value ^7- sets the material of the object. Valid materials are: 1 (metal), 2 (stone), 3 (wood)");
 				print_to(self, "^7The ^1drag object ^7key can be used to grab and carry objects. Players can only grab their own objects");
 				return TRUE;
 
diff --git a/xonotic-credits.txt b/xonotic-credits.txt
index 8f2ddab6c..fba2a0ab2 100644
--- a/xonotic-credits.txt
+++ b/xonotic-credits.txt
@@ -38,6 +38,7 @@ mand1nga
 Merlijn Hofstra
 remaxim
 Stephan
+Independent.nu
 
 *Engine Code Additions & QA
 Rudolf "divVerent" Polzer