diff options
| author | Paweł Redman <pawel.redman@gmail.com> | 2015-12-05 21:05:10 +0100 |
|---|---|---|
| committer | Paweł Redman <pawel.redman@gmail.com> | 2015-12-05 21:05:10 +0100 |
| commit | 21c41b7b5584e35edea66f66832a980363a95443 (patch) | |
| tree | 95b1f5c6df096ad1f25af7b9ea8062f2915f07c6 /src/qcommon | |
| parent | dc5cc800f856c82f4f8961dd9c1225c3fa4670bc (diff) | |
| parent | 3cc3a553cb8f00f60664189ec8d0e0c92d8344d6 (diff) | |
Merge branch 'v11b'
Diffstat (limited to 'src/qcommon')
| -rw-r--r-- | src/qcommon/q_shared.h | 10 | ||||
| -rw-r--r-- | src/qcommon/qcommon.h | 2 |
2 files changed, 4 insertions, 8 deletions
diff --git a/src/qcommon/q_shared.h b/src/qcommon/q_shared.h index a93b630..1b5fea7 100644 --- a/src/qcommon/q_shared.h +++ b/src/qcommon/q_shared.h @@ -1132,10 +1132,6 @@ typedef struct playerState_s { int torsoTimer; // don't change low priority animations until this runs out int torsoAnim; // mask off ANIM_TOGGLEBIT - int tauntTimer; // don't allow another taunt until this runs out - - int weaponAnim; // mask off ANIM_TOGGLEBIT - int movementDir; // a number 0 to 7 that represents the reletive angle // of movement to the view angle (axial and diagonals) // when at rest, the value will remain unchanged @@ -1169,8 +1165,9 @@ typedef struct playerState_s { int stats[MAX_STATS]; int persistant[MAX_PERSISTANT]; // stats that aren't cleared on death int misc[MAX_MISC]; // misc data - int ammo; // ammo held - int clips; // clips held + int ammo; + int clips; + int stuff[MAX_WEAPONS - 2]; int generic1; int loopSound; @@ -1289,7 +1286,6 @@ typedef struct entityState_s { int weapon; // determines weapon and flash model, etc int legsAnim; // mask off ANIM_TOGGLEBIT int torsoAnim; // mask off ANIM_TOGGLEBIT - int weaponAnim; // mask off ANIM_TOGGLEBIT int generic1; } entityState_t; diff --git a/src/qcommon/qcommon.h b/src/qcommon/qcommon.h index db5812f..e24ecaf 100644 --- a/src/qcommon/qcommon.h +++ b/src/qcommon/qcommon.h @@ -240,7 +240,7 @@ PROTOCOL ============================================================== */ -#define PROTOCOL_VERSION 70 +#define PROTOCOL_VERSION 69 // maintain a list of compatible protocols for demo playing // NOTE: that stuff only works with two digits protocols |