X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fcommon%2Fphysics%2Fplayer.qh;h=7bfdeb94f209e32b45fe32fa8bd25d16f55cef57;hb=fc56bbddeeb17753e0bdb9ec68b69ce90905df8f;hp=9d92581f461a99d35696d5b9624d6b974818e6e7;hpb=c9d9d189a506cb14203309f19cd9db6c6f9c06c4;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/common/physics/player.qh b/qcsrc/common/physics/player.qh
index 9d92581f4..7bfdeb94f 100644
--- a/qcsrc/common/physics/player.qh
+++ b/qcsrc/common/physics/player.qh
@@ -82,8 +82,6 @@ bool IsFlying(entity a);
 #define PHYS_VIEWHEIGHT(s)					STAT(VIEWHEIGHT, s)
 #define PHYS_HEALTH(s)						STAT(HEALTH, s)
 
-#define BUFFS_STAT(s)                       STAT(BUFFS, s)
-
 #define PHYS_ACCELERATE(s)                  STAT(MOVEVARS_ACCELERATE, s)
 #define PHYS_AIRACCELERATE(s)               STAT(MOVEVARS_AIRACCELERATE, s)
 #define PHYS_AIRACCEL_QW(s)                 STAT(MOVEVARS_AIRACCEL_QW, s)
@@ -179,17 +177,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))