Merge branch 'master' into mirceakitsune/sandbox

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

diff --git a/qcsrc/server/cheats.qc b/qcsrc/server/cheats.qc
index 85dab178725fc72875ab3cca20fe544eb089acbf..d2a21edc1002e0f27202b788ff2eea689e373bd5 100644 (file)
--- a/qcsrc/server/cheats.qc
+++ b/qcsrc/server/cheats.qc
@@ -740,11 +740,11 @@ float CheatFrame()
 
 // ENTITY DRAGGING
 
-float Drag(entity e, float grab)
+float Drag(entity e, float pick)
 {
        // returns TRUE when an entity has been picked up
-       // If grab is TRUE, the object can also be picked up if it's not being held already
-       // If grab is FALSE, only keep dragging the object if it's already being held
+       // If pick is TRUE, the object can also be picked up if it's not being held already
+       // If pick is FALSE, only keep dragging the object if it's already being held
 
        if(Drag_IsDragging(self))
        {
@@ -780,7 +780,7 @@ float Drag(entity e, float grab)
        else
        {
                if(Drag_CanDrag(self))
-                       if(self.BUTTON_DRAG && grab)
+                       if(self.BUTTON_DRAG && pick)
                        {
                                if(e)
                                        if(Drag_IsDraggable(e))