qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2025-05-30 16:30:43 +00:00
Code Issues Projects Releases Packages Wiki Activity

Reduce the diff noise for client_state_t.

Browse source 
And add a struct tag. Any added fields are, of course, unused. Most of the
changes are to bring the comments into agreement.
This commit is contained in:
Bill Currie 2013-02-02 18:01:37 +09:00
parent 7e2fcd1fbd
commit d39adc6a64
2 changed files with 14 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

9
nq/include/client.h
View file

@ -133,7 +133,7 @@ extern client_static_t cls;
/* /*
the client_state_t structure is wiped completely at every server signon the client_state_t structure is wiped completely at every server signon
*/ */
typedef struct { typedef struct client_state_s {
qboolean loading; qboolean loading;
int movemessages; // Since connecting to this server throw out int movemessages; // Since connecting to this server throw out
@ -144,7 +144,7 @@ typedef struct {
// information for local display // information for local display
int stats[MAX_CL_STATS]; // Health, etc int stats[MAX_CL_STATS]; // Health, etc
float item_gettime[32]; // cl.time of aquiring item, for blinking float item_gettime[32]; // cl.time of aquiring item, for blinking
float faceanimtime; // Use anim frame if cl.time < this float faceanimtime; // Use anim frame if cl.time < this
cshift_t cshifts[NUM_CSHIFTS]; // Color shifts for damage, powerups cshift_t cshifts[NUM_CSHIFTS]; // Color shifts for damage, powerups
cshift_t prev_cshifts[NUM_CSHIFTS]; // and content types cshift_t prev_cshifts[NUM_CSHIFTS]; // and content types
@ -170,13 +170,13 @@ typedef struct {
double laststop; double laststop;
qboolean paused; // Sent over by server qboolean paused; // Sent over by server
int onground; int onground; // -1 when in air
float viewheight; float viewheight;
float crouch; // Local amount for smoothing stepups float crouch; // Local amount for smoothing stepups
qboolean inwater; qboolean inwater;
int intermission; // Don't change view angle, full screen, etc int intermission; // Don't change view angle, full screen, etc
int completed_time; // Latched at intermission start int completed_time; // Latched from time at intermission start
double mtime[2]; // The timestamp of last two messages double mtime[2]; // The timestamp of last two messages
double time; // Clients view of time, should be between double time; // Clients view of time, should be between
@ -185,6 +185,7 @@ typedef struct {
double oldtime; // Previous cl.time, time-oldtime is used double oldtime; // Previous cl.time, time-oldtime is used
// to decay light values and smooth step ups // to decay light values and smooth step ups
double last_ping_request; // while showing scoreboard
double last_servermessage; // (realtime) for net trouble icon double last_servermessage; // (realtime) for net trouble icon
/* information that is static for the entire time connected to a server */ /* information that is static for the entire time connected to a server */

17
qw/include/client.h
View file

@ -171,7 +171,7 @@ extern client_static_t cls;
/* /*
the client_state_t structure is wiped completely at every server signon the client_state_t structure is wiped completely at every server signon
*/ */
typedef struct { typedef struct client_state_s {
qboolean loading; qboolean loading;
int movemessages; // Since connecting to this server throw out int movemessages; // Since connecting to this server throw out
@ -183,7 +183,7 @@ typedef struct {
int prev_sequence; int prev_sequence;
// information for local display // information for local display
int stats[MAX_CL_STATS]; // health, etc int stats[MAX_CL_STATS]; // Health, etc
float item_gettime[32]; // cl.time of aquiring item, for blinking float item_gettime[32]; // cl.time of aquiring item, for blinking
float faceanimtime; // Use anim frame if cl.time < this float faceanimtime; // Use anim frame if cl.time < this
@ -213,10 +213,11 @@ typedef struct {
qboolean paused; // Sent over by server qboolean paused; // Sent over by server
int onground; // -1 when in air int onground; // -1 when in air
float viewheight; float viewheight;
float crouch; // local amount for smoothing stepups float crouch; // Local amount for smoothing stepups
qboolean inwater;
int intermission; // don't change view angle, full screen, etc int intermission; // Don't change view angle, full screen, etc
int completed_time; // latched from time at intermission start int completed_time; // Latched from time at intermission start
int servercount; // server identification for prespawns int servercount; // server identification for prespawns
struct info_s *serverinfo; struct info_s *serverinfo;
@ -226,7 +227,7 @@ typedef struct {
// can't render a frame yet // can't render a frame yet
double last_ping_request; // while showing scoreboard double last_ping_request; // while showing scoreboard
double last_servermessage; double last_servermessage; // (realtime) for net trouble icon
/* information that is static for the entire time connected to a server */ /* information that is static for the entire time connected to a server */
@ -244,7 +245,7 @@ typedef struct {
char levelname[40]; // for display on solo scoreboard char levelname[40]; // for display on solo scoreboard
int spectator; int spectator;
int playernum; int playernum;
int viewentity; int viewentity; // cl_entitites[cl.viewentity] = player
unsigned protocol; unsigned protocol;
float stdver; float stdver;
int gametype; int gametype;
@ -260,7 +261,7 @@ typedef struct {
// refresh related state // refresh related state
struct model_s *worldmodel; // cl_entitites[0].model struct model_s *worldmodel; // cl_entitites[0].model
int num_entities; // stored bottom up in cl_entities array int num_entities; // held in cl_entities array
entity_t viewent; // the weapon model entity_t viewent; // the weapon model
int cdtrack; // cd audio int cdtrack; // cd audio