For now though, comment EF_SELECTABLE out. Don't want objects always turning bright...

[xonotic/xonotic-data.pk3dir.git] / qcsrc / server / mutators / sandbox.qc

diff --git a/qcsrc/server/mutators/sandbox.qc b/qcsrc/server/mutators/sandbox.qc
index d508727bc06cbf3f1b8f56f85e11640bf3a7a929..ea0823ef73346e1f0806c294135cec7230fb0dc2 100644 (file)
--- a/qcsrc/server/mutators/sandbox.qc
+++ b/qcsrc/server/mutators/sandbox.qc
@@ -1,6 +1,5 @@
 const float MAX_STORAGE_ATTACHMENTS = 16;
 float object_count;
-.string object_clipboard;
 .entity object_attach;
 .string material;
 
@@ -118,6 +117,7 @@ entity sandbox_ObjectSpawn(float database)
        e.skin = 0;
        e.material = string_null;
        e.touch = sandbox_ObjectFunction_Touch;
+       //e.effects |= EF_SELECTABLE;
 
        if(!database)
        {
@@ -284,7 +284,8 @@ entity sandbox_ObjectPort_Load(string s, float database)
                }
 
                // attach last
-               sandbox_ObjectAttach_Set(e, parent, tagname);
+               if(i)
+                       sandbox_ObjectAttach_Set(e, parent, tagname);
        }
 
        for(i = 0; i <= MAX_STORAGE_ATTACHMENTS; ++i)
@@ -373,20 +374,24 @@ MUTATOR_HOOKFUNCTION(sandbox_PlayerCommand)
                {
                        entity e;
                        float i;
+                       string s;
 
                        // ---------------- COMMAND: HELP ----------------
                        case "help":
                                print_to(self, "You can use the following sandbox commands:");
                                print_to(self, "^7\"^2object_spawn ^3models/foo/bar.md3^7\" spawns a new object in front of the player, and gives it the specified model");
                                print_to(self, "^7\"^2object_remove^7\" removes the object the player is looking at. Players can only remove their own objects");
-                               print_to(self, "^7\"^2object_duplicate ^3value^7\" duplicates the object. 'copy' copies the object, 'paste' puts it in front of the player");
+                               print_to(self, "^7\"^2object_duplicate ^3value^7\" duplicates the object, if the player has copying rights over the original");
+                               print_to(self, "^Properties for ^2object_duplicate^7:");
+                               print_to(self, "^3copy value ^7- copies the properties of the object to the specified client cvar");
+                               print_to(self, "^3paste value ^7- spawns an object with the given properties. Properties or cvars must be specified as follows; eg1: \"0 1 2 ...\", eg2: \"$cl_cvar\"");
                                print_to(self, "^7\"^2object_attach ^3property value^7\" attaches one object to another. Players can only attach their own objects");
-                               print_to(self, "^7Attachment properties for ^2object_attach^7:");
+                               print_to(self, "^7Properties for ^2object_attach^7:");
                                print_to(self, "^3get ^7- selects the object you are facing as the object to be attached");
                                print_to(self, "^3set value ^7- attaches the previously selected object to the object you are facing, on the specified bone");
                                print_to(self, "^3remove ^7- detaches all objects from the object you are facing");
                                print_to(self, "^7\"^2object_edit ^3property value^7\" edits the given property of the object. Players can only edit their own objects");
-                               print_to(self, "^7Object properties for ^2object_edit^7:");
+                               print_to(self, "^7Properties for ^2object_edit^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");
@@ -445,13 +450,13 @@ MUTATOR_HOOKFUNCTION(sandbox_PlayerCommand)
                                switch(argv(2))
                                {
                                        case "copy":
-                                               // copies customizable properties of the selected object to the clipboard
+                                               // copies customizable properties of the selected object to the clipboard cvar
                                                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;
@@ -460,8 +465,8 @@ MUTATOR_HOOKFUNCTION(sandbox_PlayerCommand)
                                                return TRUE;
 
                                        case "paste":
-                                               // spawns a new object using the properties in the player's clipboard
-                                               if(!self.object_clipboard) // no object in clipboard
+                                               // spawns a new object using the properties in the player's clipboard cvar
+                                               if(!argv(3)) // no object in clipboard
                                                {
                                                        print_to(self, "^1SANDBOX - WARNING: ^7No object in clipboard. You must copy an object before you can paste it");
                                                        return TRUE;
@@ -471,8 +476,7 @@ MUTATOR_HOOKFUNCTION(sandbox_PlayerCommand)
                                                        print_to(self, strcat("^1SANDBOX - WARNING: ^7Cannot spawn any more objects. Up to ^3", ftos(autocvar_g_sandbox_editor_maxobjects), " ^7objects may exist at a time"));
                                                        return TRUE;
                                                }
-
-                                               e = sandbox_ObjectPort_Load(self.object_clipboard, FALSE);
+                                               e = sandbox_ObjectPort_Load(argv(3), FALSE);
 
                                                print_to(self, "^2SANDBOX - INFO: ^7Object pasted successfully");
                                                if(autocvar_g_sandbox_info > 0)
@@ -684,18 +688,6 @@ MUTATOR_HOOKFUNCTION(sandbox_PlayerPreThink)
        return FALSE;
 }
 
-MUTATOR_HOOKFUNCTION(sandbox_ClientDisconnect)
-{
-       // unzone the player's clipboard if it's not empty
-       if(self.object_clipboard)
-       {
-               strunzone(self.object_clipboard);
-               self.object_clipboard = string_null;
-       }
-
-       return FALSE;
-}
-
 float autosave_time;
 MUTATOR_HOOKFUNCTION(sandbox_StartFrame)
 {
@@ -715,7 +707,6 @@ MUTATOR_DEFINITION(sandbox)
        MUTATOR_HOOK(SV_ParseClientCommand, sandbox_PlayerCommand, CBC_ORDER_ANY);
        MUTATOR_HOOK(SV_StartFrame, sandbox_StartFrame, CBC_ORDER_ANY);
        MUTATOR_HOOK(PlayerPreThink, sandbox_PlayerPreThink, CBC_ORDER_ANY);
-       MUTATOR_HOOK(ClientDisconnect, sandbox_ClientDisconnect, CBC_ORDER_ANY);
 
        MUTATOR_ONADD
        {