summaryrefslogtreecommitdiff
path: root/src/qcommon/q_shared.h
diff options
context:
space:
mode:
author/dev/humancontroller <devhc@example.com>2017-04-15 08:27:58 +0200
committer/dev/humancontroller <devhc@example.com>2017-04-15 17:21:02 +0200
commit8f6cc0930258d39570676d349db062b0c54ba1ad (patch)
treec5fa9e0bf41b1eb7b28978868891a4f68a2c269f /src/qcommon/q_shared.h
parentebd43d72d1af22fcde4b9857fb226cefab9fcdbf (diff)
multi-protocol: rename powerups to misc in the playerState_t and entityState_t structs
Diffstat (limited to 'src/qcommon/q_shared.h')
-rw-r--r--src/qcommon/q_shared.h10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/qcommon/q_shared.h b/src/qcommon/q_shared.h
index 3d6a498..2cc511e 100644
--- a/src/qcommon/q_shared.h
+++ b/src/qcommon/q_shared.h
@@ -1023,7 +1023,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
@@ -1099,7 +1099,7 @@ 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 misc[MAX_MISC]; // misc data
int ammo; // ammo held
int clips; // clips held
@@ -1219,7 +1219,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
@@ -1291,9 +1291,9 @@ typedef struct qtime_s {
// server browser sources
// TTimo: AS_MPLAYER is no longer used
-#define AS_GLOBAL 2
+#define AS_GLOBAL 0
#define AS_MPLAYER 1
-#define AS_LOCAL 0
+#define AS_LOCAL 2
#define AS_FAVORITES 3