X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Flibgame%2Fsystem.h;h=a5e0b22eba295bc28cd03645f49bcbaec44e293f;hb=4096fcbae692bfbf2f6506786659872a60b31693;hp=d5f4457f48f45219ee63ada6cd2deb1f6bdc8ff8;hpb=516fafe7ee088155d156e0f36f165a0d557d2bde;p=rocksndiamonds.git diff --git a/src/libgame/system.h b/src/libgame/system.h index d5f4457f..a5e0b22e 100644 --- a/src/libgame/system.h +++ b/src/libgame/system.h @@ -87,7 +87,7 @@ #define MB_RIGHTBUTTON 3 -/* values for basic move directions (effective at runtime) */ +/* values for move directions */ #define MV_BIT_LEFT 0 #define MV_BIT_RIGHT 1 #define MV_BIT_UP 2 @@ -95,19 +95,11 @@ #define NUM_DIRECTIONS 4 -/* values for special "button" bitmasks (effective at runtime) */ +/* values for special "button" bitmasks */ #define BUTTON_1 4 #define BUTTON_2 5 -/* values for special move patterns (stored in level files) */ -#define MV_BIT_TOWARDS_PLAYER 6 -#define MV_BIT_AWAY_FROM_PLAYER 7 -#define MV_BIT_ALONG_LEFT_SIDE 8 -#define MV_BIT_ALONG_RIGHT_SIDE 9 -#define MV_BIT_TURNING_LEFT 10 -#define MV_BIT_TURNING_RIGHT 11 - -/* values for move direction/pattern and special "button" key bitmasks */ +/* values for move direction and special "button" key bitmasks */ #define MV_NO_MOVING 0 #define MV_LEFT (1 << MV_BIT_LEFT) #define MV_RIGHT (1 << MV_BIT_RIGHT) @@ -124,17 +116,6 @@ (x) == MV_RIGHT ? MV_BIT_RIGHT : \ (x) == MV_UP ? MV_BIT_UP : MV_BIT_DOWN) -#define MV_HORIZONTAL (MV_LEFT | MV_RIGHT) -#define MV_VERTICAL (MV_UP | MV_DOWN) -#define MV_ALL_DIRECTIONS (MV_HORIZONTAL | MV_VERTICAL) -#define MV_ANY_DIRECTION (MV_ALL_DIRECTIONS) -#define MV_TOWARDS_PLAYER (1 << MV_BIT_TOWARDS_PLAYER) -#define MV_AWAY_FROM_PLAYER (1 << MV_BIT_AWAY_FROM_PLAYER) -#define MV_ALONG_LEFT_SIDE (1 << MV_BIT_ALONG_LEFT_SIDE) -#define MV_ALONG_RIGHT_SIDE (1 << MV_BIT_ALONG_RIGHT_SIDE) -#define MV_TURNING_LEFT (1 << MV_BIT_TURNING_LEFT) -#define MV_TURNING_RIGHT (1 << MV_BIT_TURNING_RIGHT) - /* values for animation mode (frame order and direction) */ #define ANIM_NONE 0