From: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Date: Sun, 6 Nov 2011 12:15:09 +0000 (+0200)
Subject: Lastly, use the correct cvar for grabbing distance, and give it a lower value
X-Git-Tag: xonotic-v0.6.0~35^2~18^2~13
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=dc1a34293241f9da4808ff65ca0a1b3dc43fd31a;p=xonotic%2Fxonotic-data.pk3dir.git

Lastly, use the correct cvar for grabbing distance, and give it a lower value
---

diff --git a/defaultXonotic.cfg b/defaultXonotic.cfg
index dc4febe88..78a228581 100644
--- a/defaultXonotic.cfg
+++ b/defaultXonotic.cfg
@@ -540,6 +540,7 @@ set g_maplist_check_waypoints 0	"when 1, maps are skipped if there currently are
 set samelevel 0 "when 1, always play the same level over and over again"
 
 set g_grab 0 "enables grabbing certain objects"
+set g_grab_range 150 "distance at which objects can be grabbed"
 
 set g_cloaked 0 "display all players mostly invisible"
 set g_player_alpha 1
@@ -554,7 +555,7 @@ set g_sandbox_storage_autoload 1 "if a storage file exists for the given map, au
 set g_sandbox_editor_maxobjects 1000 "maximum number of objects that may exist at a time"
 set g_sandbox_editor_free 1 "0 = players can only copy or edit their own objects, 1 = players can copy but not edit other objects, 2 = players can copy and edit all object"
 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_editor_distance_edit 300 "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"
 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"
diff --git a/qcsrc/server/cheats.qc b/qcsrc/server/cheats.qc
index 9d5da0d41..8e455e942 100644
--- a/qcsrc/server/cheats.qc
+++ b/qcsrc/server/cheats.qc
@@ -709,7 +709,7 @@ float CheatFrame()
 
 				float drag;
 				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);
+				WarpZone_TraceLine(self.origin + self.view_ofs, self.origin + self.view_ofs + v_forward * autocvar_g_grab_range, MOVE_NORMAL, self);
 				switch(trace_ent.grab)
 				{
 					case 0: // can't grab