summaryrefslogtreecommitdiff
path: root/src/qcommon
diff options
context:
space:
mode:
authorIronClawTrem <louie.nutman@gmail.com>2020-04-09 18:30:35 +0100
committerIronClawTrem <louie.nutman@gmail.com>2020-04-09 18:31:16 +0100
commitf324890e9715490c909ca6123948f4157401324c (patch)
tree9db453bd1cf86ea2a5751dadd073c003635f9f3e /src/qcommon
parentc378d3fb9f7f443ee6a6f78f490f2bc203aba5ea (diff)
multiprotocol: gamelogic code for 1.1
Diffstat (limited to 'src/qcommon')
-rw-r--r--src/qcommon/q_shared.h7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/qcommon/q_shared.h b/src/qcommon/q_shared.h
index 1b5fea7..68742d9 100644
--- a/src/qcommon/q_shared.h
+++ b/src/qcommon/q_shared.h
@@ -35,7 +35,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#define CLIENT_WINDOW_TITLE "Tremulous " PRODUCT_VERSION
#define CLIENT_WINDOW_MIN_TITLE "Tremulous"
-#define Q3_VERSION PRODUCT_NAME " " PRODUCT_VERSION
+#define Q3_VERSION "tremulous gpp"
#define GAMENAME_FOR_MASTER "Tremulous"
#define HEARTBEAT_FOR_MASTER GAMENAME_FOR_MASTER
@@ -1132,6 +1132,10 @@ 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
@@ -1286,6 +1290,7 @@ 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;