From: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Date: Wed, 26 Oct 2011 10:17:11 +0000 (+0300)
Subject: use stov instead of stof's where possible. The clipboard is still broken however
X-Git-Tag: xonotic-v0.6.0~35^2~18^2~156
X-Git-Url: http://de.git.xonotic.org/?a=commitdiff_plain;h=e55dd502d4f7731df492007adc1fd11d917bca3a;p=xonotic%2Fxonotic-data.pk3dir.git

use stov instead of stof's where possible. The clipboard is still broken however
---

diff --git a/qcsrc/menu/xonotic/dialog_sandboxtools.c b/qcsrc/menu/xonotic/dialog_sandboxtools.c
index 2ee34d2d3..b181f8c27 100644
--- a/qcsrc/menu/xonotic/dialog_sandboxtools.c
+++ b/qcsrc/menu/xonotic/dialog_sandboxtools.c
@@ -35,9 +35,9 @@ void XonoticSandboxToolsDialog_fill(entity me)
 		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 color 1:"), '0 0 0', "sandbox edit_object color_main $menu_sandbox_edit_color_main", 0));
+		me.TD(me, 1, 0.5, makeXonoticCommandButton(_("Set color 1:"), '0 0 0', "sandbox edit_object color_main \"$menu_sandbox_edit_color_main\"", 0));
 		me.TD(me, 2, 1.5, e = makeXonoticColorpickerString("menu_sandbox_edit_color_main", "menu_sandbox_edit_color_main"));
-		me.TD(me, 1, 0.5, makeXonoticCommandButton(_("Set color 2:"), '0 0 0', "sandbox edit_object color_glow $menu_sandbox_edit_color_glow", 0));
+		me.TD(me, 1, 0.5, makeXonoticCommandButton(_("Set color 2:"), '0 0 0', "sandbox edit_object color_glow \"$menu_sandbox_edit_color_glow\"", 0));
 		me.TD(me, 2, 1.5, e = makeXonoticColorpickerString("menu_sandbox_edit_color_glow", "menu_sandbox_edit_color_glow"));
 	me.TR(me);
 	me.TR(me);
diff --git a/qcsrc/server/mutators/sandbox.qc b/qcsrc/server/mutators/sandbox.qc
index 13fa9b41b..24c5e1897 100644
--- a/qcsrc/server/mutators/sandbox.qc
+++ b/qcsrc/server/mutators/sandbox.qc
@@ -63,8 +63,8 @@ MUTATOR_HOOKFUNCTION(sandbox_PlayerCommand)
 				print_to(self, "^7Object properties for ^2edit_object^7:");
 				print_to(self, "^3skin value ^7- changes the skin of the object");
 				print_to(self, "^3alpha value ^7- sets object transparency");
-				print_to(self, "^3colormod value_x value_y value_z ^7- main object color");
-				print_to(self, "^3glowmod value_x value_y value_z ^7- glow object color");
+				print_to(self, "^3colormod \"value_x value_y value_z\" ^7- main object color");
+				print_to(self, "^3glowmod \"value_x value_y value_z\" ^7- glow object color");
 				print_to(self, "^3frame value ^7- object animation frame, for self-animated models");
 				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");
@@ -152,8 +152,8 @@ MUTATOR_HOOKFUNCTION(sandbox_PlayerCommand)
 					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.colormod_x), " ", ftos(e.colormod_y), " ", ftos(e.colormod_z), " ");
-					self.object_clipboard = strcat(self.object_clipboard, ftos(e.glowmod_x), " ", ftos(e.glowmod_y), " ", ftos(e.glowmod_z), " ");
+					self.object_clipboard = strcat(self.object_clipboard, sprintf("\"%.9v\"", self.colormod), " ");
+					self.object_clipboard = strcat(self.object_clipboard, sprintf("\"%.9v\"", self.glowmod), " ");
 					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), " ");
@@ -183,12 +183,12 @@ MUTATOR_HOOKFUNCTION(sandbox_PlayerCommand)
 				setmodel(e, argv(0));
 				e.skin = stof(argv(1));
 				e.alpha = stof(argv(2));
-				e.colormod_x = stof(argv(3));	e.colormod_y = stof(argv(4));	e.colormod_z = stof(argv(5));
-				e.glowmod_x = stof(argv(6));	e.glowmod_y = stof(argv(7));	e.glowmod_z = stof(argv(8));
-				e.frame = stof(argv(9));
-				e.scale = stof(argv(10));	setsize(e, e.mins * e.scale, e.maxs * e.scale); // adapt bounding box size to model size
-				e.movetype = stof(argv(11));
-
+				e.colormod = stov(argv(3));
+				e.glowmod = stov(argv(4));
+				e.frame = stof(argv(5));
+				e.scale = stof(argv(6));	setsize(e, e.mins * e.scale, e.maxs * e.scale); // adapt bounding box size to model size
+				e.movetype = stof(argv(7));
+dprint(strcat(argv(3), " --------\n"));
 				print_to(self, "Object pasted");
 				if(autocvar_g_sandbox_info)
 					print(strcat(self.netname, " pasted an object at origin ", vtos(e.origin), "\n"));
@@ -215,14 +215,10 @@ MUTATOR_HOOKFUNCTION(sandbox_PlayerCommand)
 							e.alpha = stof(argv(3));
 							break;
 						case "color_main":
-							e.colormod_x = stof(argv(3));
-							e.colormod_y = stof(argv(4));
-							e.colormod_z = stof(argv(5));
+							e.colormod = stov(argv(3));
 							break;
 						case "color_glow":
-							e.glowmod_x = stof(argv(3));
-							e.glowmod_y = stof(argv(4));
-							e.glowmod_z = stof(argv(5));
+							e.glowmod = stov(argv(3));
 							break;
 						case "frame":
 							e.frame = stof(argv(3));