From: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Date: Tue, 25 Oct 2011 22:20:32 +0000 (+0300)
Subject: Allow editing object alpha as well
X-Git-Tag: xonotic-v0.6.0~35^2~18^2~158
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=27ed389e3303a15f7d6e643e9733a25994f793d5;p=xonotic%2Fxonotic-data.pk3dir.git

Allow editing object alpha as well
---

diff --git a/defaultXonotic.cfg b/defaultXonotic.cfg
index 8c3db65bd..77b9a0bbc 100644
--- a/defaultXonotic.cfg
+++ b/defaultXonotic.cfg
@@ -548,6 +548,7 @@ set g_sandbox_editor_distance_edit 350 "distance at which players can edit or re
 
 seta menu_sandbox_spawn_model "" // used to store the model in the input field
 set menu_sandbox_edit_skin 0
+set menu_sandbox_edit_alpha 1
 set menu_sandbox_edit_frame 0
 set menu_sandbox_edit_scale 1
 set menu_sandbox_edit_physics 0
diff --git a/qcsrc/menu/xonotic/dialog_sandboxtools.c b/qcsrc/menu/xonotic/dialog_sandboxtools.c
index 768262ecf..b795a255c 100644
--- a/qcsrc/menu/xonotic/dialog_sandboxtools.c
+++ b/qcsrc/menu/xonotic/dialog_sandboxtools.c
@@ -32,6 +32,9 @@ void XonoticSandboxToolsDialog_fill(entity me)
 	me.TR(me);
 		me.TD(me, 1, 0.5, makeXonoticCommandButton(_("Set skin:"), '0 0 0', "sandbox edit_object skin $menu_sandbox_edit_skin", 0));
 		me.TD(me, 1, 1.5, e = makeXonoticSlider(0, 99, 1, "menu_sandbox_edit_skin"));
+		me.TD(me, 1, 0.5, makeXonoticCommandButton(_("Set alpha:"), '0 0 0', "sandbox edit_object alpha $menu_sandbox_edit_alpha", 0));
+		me.TD(me, 1, 1.5, e = makeXonoticSlider(0.1, 1, 0.05, "menu_sandbox_edit_alpha"));
+	me.TR(me);
 		me.TD(me, 1, 0.5, makeXonoticCommandButton(_("Set frame:"), '0 0 0', "sandbox edit_object frame $menu_sandbox_edit_frame", 0));
 		me.TD(me, 1, 1.5, e = makeXonoticSlider(0, 99, 1, "menu_sandbox_edit_frame"));
 	me.TR(me);
diff --git a/qcsrc/server/mutators/sandbox.qc b/qcsrc/server/mutators/sandbox.qc
index b20b93824..c879fd59d 100644
--- a/qcsrc/server/mutators/sandbox.qc
+++ b/qcsrc/server/mutators/sandbox.qc
@@ -62,6 +62,7 @@ MUTATOR_HOOKFUNCTION(sandbox_PlayerCommand)
 				print_to(self, "^7\"^2edit_object ^3property value^7\" edits the given property of the object. Players can only edit their own objects");
 				print_to(self, "^7Object properties for ^2edit_object^7:");
 				print_to(self, "^3skin ^7- changes the skin of the object");
+				print_to(self, "^3alpha ^7- sets object transparency");
 				print_to(self, "^3frame ^7- object animation frame, for self-animated models");
 				print_to(self, "^3scale ^7- changes object scale. 0.5 is half size and 2 is double size");
 				print_to(self, "^3physics ^7- object physics, 0 = static, 1 = movable, 2 = physical");
@@ -148,6 +149,7 @@ MUTATOR_HOOKFUNCTION(sandbox_PlayerCommand)
 					// set clipboard properties
 					self.object_clipboard = strcat(e.model, " ");
 					self.object_clipboard = strcat(self.object_clipboard, ftos(e.skin), " ");
+					self.object_clipboard = strcat(self.object_clipboard, ftos(e.alpha), " ");
 					self.object_clipboard = strcat(self.object_clipboard, ftos(e.frame), " ");
 					self.object_clipboard = strcat(self.object_clipboard, ftos(e.scale), " ");
 					self.object_clipboard = strcat(self.object_clipboard, ftos(e.movetype), " ");
@@ -176,9 +178,10 @@ MUTATOR_HOOKFUNCTION(sandbox_PlayerCommand)
 				// apply clipboard properties
 				setmodel(e, argv(0));
 				e.skin = stof(argv(1));
-				e.frame = stof(argv(2));
-				e.scale = stof(argv(3));	setsize(e, e.mins * e.scale, e.maxs * e.scale); // adapt bounding box size to model size
-				e.movetype = stof(argv(4));
+				e.alpha = stof(argv(2));
+				e.frame = stof(argv(3));
+				e.scale = stof(argv(4));	setsize(e, e.mins * e.scale, e.maxs * e.scale); // adapt bounding box size to model size
+				e.movetype = stof(argv(5));
 
 				print_to(self, "Object pasted");
 				if(autocvar_g_sandbox_info)
@@ -202,6 +205,9 @@ MUTATOR_HOOKFUNCTION(sandbox_PlayerCommand)
 						case "skin":
 							e.skin = stof(argv(3));
 							break;
+						case "alpha":
+							e.alpha = stof(argv(3));
+							break;
 						case "frame":
 							e.frame = stof(argv(3));
 							break;