From 3108bde4738357e3fec209e1deb7f20cf6663c6d Mon Sep 17 00:00:00 2001
From: Paweł Redman <pawel.redman@gmail.com>
Date: Sun, 29 Nov 2015 20:29:30 +0100
Subject: Port to 1.1 network protocol.
---
src/qcommon/q_shared.h | 10 +++-------
src/qcommon/qcommon.h | 2 +-
2 files changed, 4 insertions(+), 8 deletions(-)
(limited to 'src/qcommon')
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
--
cgit