Rename cvars for object limits and free editing

diff --git a/defaultXonotic.cfg b/defaultXonotic.cfg
index 10f2f7c5f9e6bb5a4e9dcccec5bd0af11bd5c0e8..331b421b23d1e237be1fcb8be96b85bcbf1c499c 100644 (file)
--- a/defaultXonotic.cfg
+++ b/defaultXonotic.cfg
@@ -543,8 +543,8 @@ seta g_balance_cloaked_alpha 0.25
 
 set g_sandbox 0 "allow players to spawn and edit objects around the map"
 set g_sandbox_info 1 "print non-critical information to the server"
-set g_sandbox_maxplayerobjects 100 "maximum number of objects a player can have at a time"
-set g_sandbox_freeedit 0 "when enabled, players can edit any object on the map, not just the objects they've spawned"
+set g_sandbox_editor_maxobjects 100 "maximum number of objects a player can have at a time"
+set g_sandbox_editor_free 0 "when enabled, players can edit any object on the map, not just the objects they've spawned"
 set g_sandbox_editor_distance_spawn 200 "distance at which objects spawn in front of the player"
 set g_sandbox_editor_distance_edit 350 "distance at which players can edit or remove objects they are looking at"
 set g_sandbox_object_scale_min 0.1 "minimum scale that objects can be set to"

diff --git a/qcsrc/server/autocvars.qh b/qcsrc/server/autocvars.qh
index e3c8a169f9a0ec49713bebe0fc3460b9009d6df4..c27dd3a220099afa528a0e3b749e65617359b1db 100644 (file)
--- a/qcsrc/server/autocvars.qh
+++ b/qcsrc/server/autocvars.qh
@@ -1200,8 +1200,8 @@ float autocvar_g_trueaim_minrange;
 float autocvar_g_debug_defaultsounds;
 float autocvar_g_loituma;
 float autocvar_g_sandbox_info;
-float autocvar_g_sandbox_maxplayerobjects;
-float autocvar_g_sandbox_freeedit;
+float autocvar_g_sandbox_editor_maxobjects;
+float autocvar_g_sandbox_editor_free;
 float autocvar_g_sandbox_editor_distance_spawn;
 float autocvar_g_sandbox_editor_distance_edit;
 float autocvar_g_sandbox_object_scale_min;

diff --git a/qcsrc/server/mutators/sandbox.qc b/qcsrc/server/mutators/sandbox.qc
index 51c14b05aead2fc257bbe669612f0ce0e795e24f..668a652ea22ce0f5ac9f9f5c686fae6f69bfe29e 100644 (file)
--- a/qcsrc/server/mutators/sandbox.qc
+++ b/qcsrc/server/mutators/sandbox.qc
@@ -59,7 +59,7 @@ entity sandbox_EditObject_Get()
 
        makevectors(self.v_angle);
        WarpZone_TraceLine(self.origin + self.view_ofs, self.origin + self.view_ofs + v_forward * autocvar_g_sandbox_editor_distance_edit, MOVE_NORMAL, self);
-       if(trace_ent.classname == "object" && !(trace_ent.realowner != self && !autocvar_g_sandbox_freeedit))
+       if(trace_ent.classname == "object" && !(trace_ent.realowner != self && !autocvar_g_sandbox_editor_free))
                return trace_ent;
        else
                return world;
@@ -261,9 +261,9 @@ MUTATOR_HOOKFUNCTION(sandbox_PlayerCommand)
 
                        // ---------------- COMMAND: SPAWN OBJECT ----------------
                        case "spawn_object":
-                               if(self.object_count >= autocvar_g_sandbox_maxplayerobjects)
+                               if(self.object_count >= autocvar_g_sandbox_editor_maxobjects)
                                {
-                                       print_to(self, strcat("WARNING: Cannot spawn any more objects. Each player may have up to ^3", ftos(autocvar_g_sandbox_maxplayerobjects), " ^7objects at a time"));
+                                       print_to(self, strcat("WARNING: Cannot spawn any more objects. Each player may have up to ^3", ftos(autocvar_g_sandbox_editor_maxobjects), " ^7objects at a time"));
                                        return TRUE;
                                }
                                if(cmd_argc < 3)
@@ -326,9 +326,9 @@ MUTATOR_HOOKFUNCTION(sandbox_PlayerCommand)
                                        print_to(self, "WARNING: No object in clipboard. You must copy an object before you can paste it");
                                        return TRUE;
                                }
-                               if(self.object_count >= autocvar_g_sandbox_maxplayerobjects)
+                               if(self.object_count >= autocvar_g_sandbox_editor_maxobjects)
                                {
-                                       print_to(self, strcat("WARNING: Cannot spawn any more objects. Each player may have up to ^3", ftos(autocvar_g_sandbox_maxplayerobjects), " ^7objects at a time"));
+                                       print_to(self, strcat("WARNING: Cannot spawn any more objects. Each player may have up to ^3", ftos(autocvar_g_sandbox_editor_maxobjects), " ^7objects at a time"));
                                        return TRUE;
                                }