And now for something a little different: No longer use a string for the clipboard...

diff --git a/defaultXonotic.cfg b/defaultXonotic.cfg
index b3a5f54de020441a24baec32d04205fe924e15f3..a155221fe924e6b5e0169d1292744b3c373a03e1 100644 (file)
--- a/defaultXonotic.cfg
+++ b/defaultXonotic.cfg
@@ -557,6 +557,7 @@ set g_sandbox_object_scale_min 0.1 "minimum scale that objects can be set to"
 set g_sandbox_object_scale_max 2 "maximum scale that objects can be set to"
 set g_sandbox_object_material_velocity_min 100 "velocity objects must have while colliding for material effects to be applied"
 set g_sandbox_object_material_velocity_factor 0.002 "velocity range which decides the intensity of material effects"
+set cl_sandbox_clipboard ""
 
 seta menu_sandbox_spawn_model ""
 seta menu_sandbox_attach_bone ""

diff --git a/qcsrc/menu/xonotic/dialog_sandboxtools.c b/qcsrc/menu/xonotic/dialog_sandboxtools.c
index ed2d7194970ec38950358a4c1489f6bbc8facc78..f9f22942a7f4872da698bf69f35d15de9b19f76d 100644 (file)
--- a/qcsrc/menu/xonotic/dialog_sandboxtools.c
+++ b/qcsrc/menu/xonotic/dialog_sandboxtools.c
@@ -24,7 +24,7 @@ void XonoticSandboxToolsDialog_fill(entity me)
                me.TD(me, 1, 0.5, makeXonoticCommandButton(_("Spawn"), '0 0 0', "sandbox object_spawn \"$menu_sandbox_spawn_model\"", 0));
                me.TD(me, 1, 0.5, makeXonoticCommandButton(_("Remove *"), '0 0 0', "sandbox object_remove", 0));
        me.TDempty(me, 0.1);
-               me.TD(me, 1, 0.5, makeXonoticCommandButton(_("Copy *"), '0 0 0', "sandbox object_duplicate copy", 0));
+               me.TD(me, 1, 0.5, makeXonoticCommandButton(_("Copy *"), '0 0 0', "sandbox object_duplicate copy cl_sandbox_clipboard", 0));
                me.TD(me, 1, 0.5, makeXonoticCommandButton(_("Paste"), '0 0 0', "sandbox object_duplicate paste", 0));
        me.TR(me);
                me.TD(me, 1, 0.25, e = makeXonoticTextLabel(0, _("Bone:")));

diff --git a/qcsrc/server/mutators/sandbox.qc b/qcsrc/server/mutators/sandbox.qc
index 9af2e65a510effe84c6841b7993906999118d589..e49fbd21885a285d4155424bc6724abe0d3e17da 100644 (file)
--- a/qcsrc/server/mutators/sandbox.qc
+++ b/qcsrc/server/mutators/sandbox.qc
@@ -374,6 +374,7 @@ MUTATOR_HOOKFUNCTION(sandbox_PlayerCommand)
                {
                        entity e;
                        float i;
+                       string s;
 
                        // ---------------- COMMAND: HELP ----------------
                        case "help":
@@ -450,9 +451,9 @@ MUTATOR_HOOKFUNCTION(sandbox_PlayerCommand)
                                                e = sandbox_ObjectEdit_Get(autocvar_g_sandbox_editor_free); // can we copy objects we can't edit?
                                                if(e != world)
                                                {
-                                                       if(self.object_clipboard)
-                                                               strunzone(self.object_clipboard);
-                                                       self.object_clipboard = strzone(sandbox_ObjectPort_Save(e, FALSE));
+                                                       s = sandbox_ObjectPort_Save(e, FALSE);
+                                                       s = strreplace("\"", "\\\"", s);
+                                                       stuffcmd(self, strcat("set ", argv(3), " \"", s, "\""));
 
                                                        print_to(self, "^2SANDBOX - INFO: ^7Object copied to clipboard");
                                                        return TRUE;