From: Mircea Kitsune Date: Sun, 6 Nov 2011 15:50:44 +0000 (+0200) Subject: Fix local defined with the name of a global X-Git-Tag: xonotic-v0.6.0~35^2~18^2~7 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=081750e5571a0a1894d437b756d1dd557e0e14dd;p=xonotic%2Fxonotic-data.pk3dir.git Fix local defined with the name of a global --- diff --git a/qcsrc/server/cheats.qc b/qcsrc/server/cheats.qc index 85dab1787..d2a21edc1 100644 --- 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))