Cleanup

[xonotic/xonotic-data.pk3dir.git] / qcsrc / common / physics / player.qh

diff --git a/qcsrc/common/physics/player.qh b/qcsrc/common/physics/player.qh
index 9d92581f461a99d35696d5b9624d6b974818e6e7..eb044fb24f31aace84f193b04fdb8320d3d0611a 100644 (file)
--- a/qcsrc/common/physics/player.qh
+++ b/qcsrc/common/physics/player.qh
@@ -179,17 +179,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)) \
+         (BIT(0) * PHYS_INPUT_BUTTON_ATCK(s)) \
+       | (BIT(1) * PHYS_INPUT_BUTTON_JUMP(s)) \
+       | (BIT(2) * PHYS_INPUT_BUTTON_ATCK2(s)) \
+       | (BIT(3) * PHYS_INPUT_BUTTON_ZOOM(s)) \
+       | (BIT(4) * PHYS_INPUT_BUTTON_CROUCH(s)) \
+       | (BIT(5) * PHYS_INPUT_BUTTON_HOOK(s)) \
+       | (BIT(6) * PHYS_INPUT_BUTTON_USE(s)) \
+       | (BIT(7) * PHYS_INPUT_BUTTON_BACKWARD(s)) \
+       | (BIT(8) * PHYS_INPUT_BUTTON_FORWARD(s)) \
+       | (BIT(9) * PHYS_INPUT_BUTTON_LEFT(s)) \
+       | (BIT(10) * PHYS_INPUT_BUTTON_RIGHT(s)) \
        )
 
 #define IS_JUMP_HELD(s)                     (!((s).flags & FL_JUMPRELEASED))