[PATCH] Define bitfields using shifts To make the item bitfields a little more readable, define them using shifts. Tidy up the spacing (tab vs. space) of these particular defines. diff -urN a/NQ/quakedef.h head/NQ/quakedef.h --- a/NQ/quakedef.h 2006-03-11 23:24:21.000000000 +1030 +++ head/NQ/quakedef.h 2006-03-11 23:57:47.000000000 +1030 @@ -94,87 +94,91 @@ // // stats are integers communicated to the client by the server // -#define MAX_CL_STATS 32 -#define STAT_HEALTH 0 -#define STAT_FRAGS 1 -#define STAT_WEAPON 2 -#define STAT_AMMO 3 -#define STAT_ARMOR 4 -#define STAT_WEAPONFRAME 5 -#define STAT_SHELLS 6 -#define STAT_NAILS 7 -#define STAT_ROCKETS 8 -#define STAT_CELLS 9 -#define STAT_ACTIVEWEAPON 10 -#define STAT_TOTALSECRETS 11 -#define STAT_TOTALMONSTERS 12 -#define STAT_SECRETS 13 // bumped on client side by svc_foundsecret -#define STAT_MONSTERS 14 // bumped by svc_killedmonster +#define MAX_CL_STATS 32 +#define STAT_HEALTH 0 +#define STAT_FRAGS 1 +#define STAT_WEAPON 2 +#define STAT_AMMO 3 +#define STAT_ARMOR 4 +#define STAT_WEAPONFRAME 5 +#define STAT_SHELLS 6 +#define STAT_NAILS 7 +#define STAT_ROCKETS 8 +#define STAT_CELLS 9 +#define STAT_ACTIVEWEAPON 10 +#define STAT_TOTALSECRETS 11 +#define STAT_TOTALMONSTERS 12 +#define STAT_SECRETS 13 /* bumped client side by svc_foundsecret */ +#define STAT_MONSTERS 14 /* bumped by svc_killedmonster */ // stock defines -#define IT_SHOTGUN 1 -#define IT_SUPER_SHOTGUN 2 -#define IT_NAILGUN 4 -#define IT_SUPER_NAILGUN 8 -#define IT_GRENADE_LAUNCHER 16 -#define IT_ROCKET_LAUNCHER 32 -#define IT_LIGHTNING 64 -#define IT_SUPER_LIGHTNING 128 -#define IT_SHELLS 256 -#define IT_NAILS 512 -#define IT_ROCKETS 1024 -#define IT_CELLS 2048 -#define IT_AXE 4096 -#define IT_ARMOR1 8192 -#define IT_ARMOR2 16384 -#define IT_ARMOR3 32768 -#define IT_SUPERHEALTH 65536 -#define IT_KEY1 131072 -#define IT_KEY2 262144 -#define IT_INVISIBILITY 524288 -#define IT_INVULNERABILITY 1048576 -#define IT_SUIT 2097152 -#define IT_QUAD 4194304 -#define IT_SIGIL1 (1<<28) -#define IT_SIGIL2 (1<<29) -#define IT_SIGIL3 (1<<30) -#define IT_SIGIL4 (1<<31) +#define IT_SHOTGUN (1 << 0) +#define IT_SUPER_SHOTGUN (1 << 1) +#define IT_NAILGUN (1 << 2) +#define IT_SUPER_NAILGUN (1 << 3) +#define IT_GRENADE_LAUNCHER (1 << 4) +#define IT_ROCKET_LAUNCHER (1 << 5) +#define IT_LIGHTNING (1 << 6) +#define IT_SUPER_LIGHTNING (1 << 7) +#define IT_SHELLS (1 << 8) +#define IT_NAILS (1 << 9) +#define IT_ROCKETS (1 << 10) +#define IT_CELLS (1 << 11) +#define IT_AXE (1 << 12) +#define IT_ARMOR1 (1 << 13) +#define IT_ARMOR2 (1 << 14) +#define IT_ARMOR3 (1 << 15) +#define IT_SUPERHEALTH (1 << 16) +#define IT_KEY1 (1 << 17) +#define IT_KEY2 (1 << 18) +#define IT_INVISIBILITY (1 << 19) +#define IT_INVULNERABILITY (1 << 20) +#define IT_SUIT (1 << 21) +#define IT_QUAD (1 << 22) + +#define IT_SIGIL1 (1 << 28) +#define IT_SIGIL2 (1 << 29) +#define IT_SIGIL3 (1 << 30) +#define IT_SIGIL4 (1 << 31) //=========================================== //rogue changed and added defines -#define RIT_SHELLS 128 -#define RIT_NAILS 256 -#define RIT_ROCKETS 512 -#define RIT_CELLS 1024 -#define RIT_AXE 2048 -#define RIT_LAVA_NAILGUN 4096 -#define RIT_LAVA_SUPER_NAILGUN 8192 -#define RIT_MULTI_GRENADE 16384 -#define RIT_MULTI_ROCKET 32768 -#define RIT_PLASMA_GUN 65536 -#define RIT_ARMOR1 8388608 -#define RIT_ARMOR2 16777216 -#define RIT_ARMOR3 33554432 -#define RIT_LAVA_NAILS 67108864 -#define RIT_PLASMA_AMMO 134217728 -#define RIT_MULTI_ROCKETS 268435456 -#define RIT_SHIELD 536870912 -#define RIT_ANTIGRAV 1073741824 -#define RIT_SUPERHEALTH 2147483648 +#define RIT_SHELLS (1 << 7) +#define RIT_NAILS (1 << 8) +#define RIT_ROCKETS (1 << 9) +#define RIT_CELLS (1 << 10) +#define RIT_AXE (1 << 11) +#define RIT_LAVA_NAILGUN (1 << 12) +#define RIT_LAVA_SUPER_NAILGUN (1 << 13) +#define RIT_MULTI_GRENADE (1 << 14) +#define RIT_MULTI_ROCKET (1 << 15) +#define RIT_PLASMA_GUN (1 << 16) + +#define RIT_ARMOR1 (1 << 23) +#define RIT_ARMOR2 (1 << 24) +#define RIT_ARMOR3 (1 << 25) +#define RIT_LAVA_NAILS (1 << 26) +#define RIT_PLASMA_AMMO (1 << 27) +#define RIT_MULTI_ROCKETS (1 << 28) +#define RIT_SHIELD (1 << 29) +#define RIT_ANTIGRAV (1 << 30) +#define RIT_SUPERHEALTH (1 << 31) //MED 01/04/97 added hipnotic defines //=========================================== //hipnotic added defines -#define HIT_MJOLNIR_BIT 7 -#define HIT_PROXIMITY_GUN_BIT 16 -#define HIT_LASER_CANNON_BIT 23 -#define HIT_MJOLNIR (1<