diff options
| author | Tim Angus <tim@ngus.net> | 2007-09-25 13:41:22 +0000 |
|---|---|---|
| committer | Tim Angus <tim@ngus.net> | 2007-09-25 13:41:22 +0000 |
| commit | ef5690eecfe614cee99b56d32b3634980b9a0e9d (patch) | |
| tree | ba3dc9966502bb5bb4b67a8bc17823af9a579998 /src/qcommon/q_shared.h | |
| parent | 1b2c5b4e113fb1f182158f7c7b191717b79e3836 (diff) | |
* Replace "powerups" state data with "misc"
* Remove ps->ammo[ ] and replace with ps->ammo and ps->clips; this means
only one ammo using weapon may be carried at once, but this is the
case anyway
* No need for BG_(Un)PackAmmoArray anymore, so remove them
Diffstat (limited to 'src/qcommon/q_shared.h')
| -rw-r--r-- | src/qcommon/q_shared.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/qcommon/q_shared.h b/src/qcommon/q_shared.h index 8c61aa7d..3622097b 100644 --- a/src/qcommon/q_shared.h +++ b/src/qcommon/q_shared.h @@ -1013,7 +1013,7 @@ typedef struct { // bit field limits #define MAX_STATS 16 #define MAX_PERSISTANT 16 -#define MAX_POWERUPS 16 +#define MAX_MISC 16 #define MAX_WEAPONS 16 #define MAX_PS_EVENTS 2 @@ -1085,8 +1085,9 @@ typedef struct playerState_s { int stats[MAX_STATS]; int persistant[MAX_PERSISTANT]; // stats that aren't cleared on death - int powerups[MAX_POWERUPS]; // level.time that the powerup runs out - int ammo[MAX_WEAPONS]; + int misc[MAX_MISC]; // misc data + int ammo; // ammo held + int clips; // clips held int generic1; int loopSound; @@ -1204,7 +1205,7 @@ typedef struct entityState_s { int eventParm; // for players - int powerups; // bit flags + int misc; // bit flags int weapon; // determines weapon and flash model, etc int legsAnim; // mask off ANIM_TOGGLEBIT int torsoAnim; // mask off ANIM_TOGGLEBIT |