From f221ce287447b4f88e097e372e052b745e072dec Mon Sep 17 00:00:00 2001 From: Mircea Kitsune Date: Sun, 6 Nov 2011 15:38:48 +0200 Subject: [PATCH] Actually, remove the g_grab switch permanently, and leave only the cvar to select grabbing distance. The code must enable an entity to be grabbed, so there's no point in having a cvar too. --- defaultXonotic.cfg | 3 +-- qcsrc/server/autocvars.qh | 1 - qcsrc/server/cheats.qc | 15 ++++----------- 3 files changed, 5 insertions(+), 14 deletions(-) diff --git a/defaultXonotic.cfg b/defaultXonotic.cfg index 78c4350a2..4435adc5c 100644 --- a/defaultXonotic.cfg +++ b/defaultXonotic.cfg @@ -539,8 +539,7 @@ seta g_maplist_shuffle 1 "new randomization method: like selectrandom, but avoid set g_maplist_check_waypoints 0 "when 1, maps are skipped if there currently are bots, but the map has no waypoints" set samelevel 0 "when 1, always play the same level over and over again" -set g_grab 1 "enables grabbing certain objects" -set g_grab_range 150 "distance at which objects can be grabbed" +set g_grab_range 150 "distance at which dragable objects can be grabbed" set g_cloaked 0 "display all players mostly invisible" set g_player_alpha 1 diff --git a/qcsrc/server/autocvars.qh b/qcsrc/server/autocvars.qh index a8aa59179..edd3420ec 100644 --- a/qcsrc/server/autocvars.qh +++ b/qcsrc/server/autocvars.qh @@ -1203,7 +1203,6 @@ float autocvar_sv_gameplayfix_gravityunaffectedbyticrate; float autocvar_g_trueaim_minrange; float autocvar_g_debug_defaultsounds; float autocvar_g_loituma; -float autocvar_g_grab; float autocvar_g_grab_range; float autocvar_g_sandbox_info; float autocvar_g_sandbox_readonly; diff --git a/qcsrc/server/cheats.qc b/qcsrc/server/cheats.qc index 497da3081..85dab1787 100644 --- a/qcsrc/server/cheats.qc +++ b/qcsrc/server/cheats.qc @@ -683,11 +683,9 @@ float CheatFrame() BEGIN_CHEAT_FUNCTION(); // Dragging can be used as either a cheat, or a function for some objects. If sv_cheats is active, - // the cheat dragging is used (unlimited pickup range and any entity can be carried), even if - // g_grab is enabled. Is sv_cheats is disabled but g_grab is not, normal dragging is - // used (limited pickup range and only dragable objects can be carried), grabbing itself - // no longer being accounted as cheating. If both sv_cheats and g_grab are disabled, players - // attempting to grab objects are reported as trying to cheat. + // the cheat dragging is used (unlimited pickup range and any entity can be carried). If sv_cheats + // is disabled, normal dragging is used (limited pickup range and only dragable objects can be carried), + // grabbing itself no longer being accounted as cheating. switch(0) { @@ -700,7 +698,7 @@ float CheatFrame() if(Drag(trace_ent, TRUE)) DID_CHEAT(); } - else if(autocvar_g_grab) + else { // drag is TRUE if the object can be picked up. While an object is being carried, the Drag() function // must execute for it either way, otherwise it would cause bugs if it went out of the player's trace. @@ -730,11 +728,6 @@ float CheatFrame() } Drag(trace_ent, drag); // execute dragging } - else if(self.BUTTON_DRAG) - { - // consider dragging a cheat if g_grab is disabled - IS_CHEAT(0, 0, CHRAME_DRAG); - } break; } -- 2.39.2