From: Martin Taibr Date: Tue, 8 Oct 2019 19:05:41 +0000 (+0200) Subject: don't mix bit and arith ops X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=056f60dee471c2a9a7585a0b57e39dc01ae818b0;p=xonotic%2Fxonotic-data.pk3dir.git don't mix bit and arith ops --- diff --git a/qcsrc/common/physics/player.qh b/qcsrc/common/physics/player.qh index 97a422423..08eb4603b 100644 --- a/qcsrc/common/physics/player.qh +++ b/qcsrc/common/physics/player.qh @@ -135,17 +135,17 @@ STATIC_INIT(PHYS_INPUT_BUTTON) // used for special commands and idle checking, not from the engine // TODO: cache #define PHYS_INPUT_BUTTON_MASK(s) ( \ - (1 << 0) * PHYS_INPUT_BUTTON_ATCK(s) \ - | (1 << 1) * PHYS_INPUT_BUTTON_JUMP(s) \ - | (1 << 2) * PHYS_INPUT_BUTTON_ATCK2(s) \ - | (1 << 3) * PHYS_INPUT_BUTTON_ZOOM(s) \ - | (1 << 4) * PHYS_INPUT_BUTTON_CROUCH(s) \ - | (1 << 5) * PHYS_INPUT_BUTTON_HOOK(s) \ - | (1 << 6) * PHYS_INPUT_BUTTON_USE(s) \ - | (1 << 7) * PHYS_INPUT_BUTTON_BACKWARD(s) \ - | (1 << 8) * PHYS_INPUT_BUTTON_FORWARD(s) \ - | (1 << 9) * PHYS_INPUT_BUTTON_LEFT(s) \ - | (1 << 10) * PHYS_INPUT_BUTTON_RIGHT(s) \ + ((1 << 0) * PHYS_INPUT_BUTTON_ATCK(s)) \ + | ((1 << 1) * PHYS_INPUT_BUTTON_JUMP(s)) \ + | ((1 << 2) * PHYS_INPUT_BUTTON_ATCK2(s)) \ + | ((1 << 3) * PHYS_INPUT_BUTTON_ZOOM(s)) \ + | ((1 << 4) * PHYS_INPUT_BUTTON_CROUCH(s)) \ + | ((1 << 5) * PHYS_INPUT_BUTTON_HOOK(s)) \ + | ((1 << 6) * PHYS_INPUT_BUTTON_USE(s)) \ + | ((1 << 7) * PHYS_INPUT_BUTTON_BACKWARD(s)) \ + | ((1 << 8) * PHYS_INPUT_BUTTON_FORWARD(s)) \ + | ((1 << 9) * PHYS_INPUT_BUTTON_LEFT(s)) \ + | ((1 << 10) * PHYS_INPUT_BUTTON_RIGHT(s)) \ ) #define IS_JUMP_HELD(s) (!((s).flags & FL_JUMPRELEASED))