diff options
Diffstat (limited to 'src/game/bg_public.h')
| -rw-r--r-- | src/game/bg_public.h | 61 |
1 files changed, 33 insertions, 28 deletions
diff --git a/src/game/bg_public.h b/src/game/bg_public.h index 16c9d29d..37a6d367 100644 --- a/src/game/bg_public.h +++ b/src/game/bg_public.h @@ -28,31 +28,34 @@ // because games can change separately from the main system version, we need a // second version that must match between game and cgame -#define GAME_VERSION "baseq3-1" +#define GAME_VERSION "baseq3-1" -#define DEFAULT_GRAVITY 800 -#define GIB_HEALTH -40 -#define ARMOR_PROTECTION 0.66 +#define DEFAULT_GRAVITY 800 +#define GIB_HEALTH -40 +#define ARMOR_PROTECTION 0.66 -#define MAX_ITEMS 256 +#define MAX_ITEMS 256 -#define RANK_TIED_FLAG 0x4000 +#define RANK_TIED_FLAG 0x4000 #define DEFAULT_SHOTGUN_SPREAD 700 -#define DEFAULT_SHOTGUN_COUNT 11 +#define DEFAULT_SHOTGUN_COUNT 11 -#define ITEM_RADIUS 15 // item sizes are needed for client side pickup detection +#define ITEM_RADIUS 15 // item sizes are needed for client side pickup detection -#define LIGHTNING_RANGE 768 +#define LIGHTNING_RANGE 768 -#define SCORE_NOT_PRESENT -9999 // for the CS_SCORES[12] when only one player is present +#define SCORE_NOT_PRESENT -9999 // for the CS_SCORES[12] when only one player is present -#define VOTE_TIME 30000 // 30 seconds before vote times out +#define VOTE_TIME 30000 // 30 seconds before vote times out -#define MINS_Z -24 -#define DEFAULT_VIEWHEIGHT 26 -#define CROUCH_VIEWHEIGHT 12 -#define DEAD_VIEWHEIGHT -16 +#define MINS_Z -24 +#define DEFAULT_VIEWHEIGHT 26 +#define CROUCH_VIEWHEIGHT 12 +#define DEAD_VIEWHEIGHT -16 + +#define MAX_POUNCE_SPEED 750 +#define POUNCE_TIME 1000.0f // // config strings are a general means of communicating variable length strings @@ -82,6 +85,7 @@ #define CS_FLAGSTATUS 23 // string indicating flag status in CTF #define CS_SHADERSTATE 24 #define CS_BOTINFO 25 +#define CS_CLIENTS_READY 26 //TA: following suggestion in STAT_ enum STAT_CLIENTS_READY becomes a configstring #define CS_ITEMS 27 // string of 0's and 1's that tell which items are present @@ -153,19 +157,20 @@ typedef enum { } weaponstate_t; // pmove->pm_flags -#define PMF_DUCKED 1 -#define PMF_JUMP_HELD 2 +#define PMF_DUCKED 1 +#define PMF_JUMP_HELD 2 #define PMF_BACKWARDS_JUMP 8 // go into backwards land -#define PMF_BACKWARDS_RUN 16 // coast down to backwards run -#define PMF_TIME_LAND 32 // pm_time is time before rejump +#define PMF_BACKWARDS_RUN 16 // coast down to backwards run +#define PMF_TIME_LAND 32 // pm_time is time before rejump #define PMF_TIME_KNOCKBACK 64 // pm_time is an air-accelerate only time #define PMF_TIME_WATERJUMP 256 // pm_time is waterjump -#define PMF_RESPAWNED 512 // clear after attack and jump buttons come up -#define PMF_USE_ITEM_HELD 1024 -#define PMF_GRAPPLE_PULL 2048 // pull towards grapple location -#define PMF_FOLLOW 4096 // spectate following another player -#define PMF_SCOREBOARD 8192 // spectate as a scoreboard -#define PMF_INVULEXPAND 16384 // invulnerability sphere set to full size +#define PMF_RESPAWNED 512 // clear after attack and jump buttons come up +#define PMF_USE_ITEM_HELD 1024 +#define PMF_GRAPPLE_PULL 2048 // pull towards grapple location +#define PMF_FOLLOW 4096 // spectate following another player +#define PMF_SCOREBOARD 8192 // spectate as a scoreboard +#define PMF_INVULEXPAND 16384 // invulnerability sphere set to full size +#define PMF_POUNCE 32768 //TA: keep track of pouncing #define PMF_ALL_TIMES (PMF_TIME_WATERJUMP|PMF_TIME_LAND|PMF_TIME_KNOCKBACK) @@ -221,14 +226,13 @@ typedef enum { STAT_WEAPONS, // 16 bit fields STAT_WEAPONS2, //TA: another 16 bits to push the max weapon count up STAT_ARMOR, - STAT_DEAD_YAW, // look this direction when dead (FIXME: get rid of?) - STAT_CLIENTS_READY, // bit mask of clients wishing to exit the intermission (FIXME: configstring?) STAT_MAX_HEALTH, // health / armor limit, changable by handicap STAT_PCLASS, //TA: player class (for droids AND humans) STAT_PTEAM, //TA: player team STAT_STAMINA, //TA: stamina (human only) STAT_STATE, //TA: client states e.g. wall climbing - STAT_CREDIT //TA: human credit + STAT_CREDIT, //TA: human credit + STAT_MISC //TA: for uh...misc stuff } statIndex_t; #define SCA_WALLCLIMBER 1 @@ -335,6 +339,7 @@ typedef enum { WP_GRAPPLING_HOOK, WP_VENOM, WP_GRABANDCSAW, + WP_POUNCE, WP_HBUILD, WP_DBUILD, WP_SCANNER, |