qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2024-11-22 12:31:10 +00:00
Code Issues Projects Releases Packages Wiki Activity

Rename entity_state_t's skln to skinnum in nq.

Browse source 
Also some whitespace and comment corrections.
This commit is contained in:
Bill Currie 2012-05-24 21:13:33 +09:00
parent 25cb618e4d
commit 9c440ad9e2
6 changed files with 16 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
include/qw/protocol.h
View file

@ -304,6 +304,7 @@ typedef struct {
int number; // edict index
unsigned int flags; // nolerp, etc
vec3_t origin;
vec3_t angles;
unsigned short modelindex;

5
nq/include/client.h
View file

@ -146,8 +146,7 @@ extern client_static_t cls;
the client_state_t structure is wiped completely at every
server signon
*/
typedef struct
{
typedef struct {
qboolean loading;
int movemessages; // Since connecting to this server throw out
@ -196,7 +195,7 @@ typedef struct
double mtime[2]; // The timestamp of last two messages
double time; // Clients view of time, should be between
// servertime and oldservertime to generate a
// servertime and oldvertime to generate a
// lerp point for other data
double oldtime; // Previous cl.time, time-oldtime is used
// to decay light values and smooth step ups

7
nq/include/protocol.h
View file

@ -223,15 +223,16 @@
#define MAX_CLIENTS 16
typedef struct entity_state_s
{
typedef struct entity_state_s {
vec3_t origin;
vec3_t angles;
unsigned short modelindex;
unsigned short frame;
int effects;
byte colormap;
byte skin;
byte skinnum;
// QSG 2
byte alpha;
byte scale;
byte glow_size;

6
nq/source/cl_parse.c
View file

@ -528,7 +528,7 @@ CL_ParseUpdate (int bits)
if (bits & U_SKIN)
skin = MSG_ReadByte (net_message);
else
skin = state->baseline.skin;
skin = state->baseline.skinnum;
if (skin != ent->skinnum) {
ent->skinnum = skin;
if (num <= cl.maxclients) {
@ -641,7 +641,7 @@ CL_ParseBaseline (cl_entity_state_t *state, int version)
state->baseline.frame = MSG_ReadByte (net_message);
state->baseline.colormap = MSG_ReadByte (net_message);
state->baseline.skin = MSG_ReadByte (net_message);
state->baseline.skinnum = MSG_ReadByte (net_message);
MSG_ReadCoordAngleV (net_message, state->baseline.origin,
state->baseline.angles);
@ -814,7 +814,7 @@ CL_ParseStatic (int version)
ent->model = cl.model_precache[state.baseline.modelindex];
ent->frame = state.baseline.frame;
ent->skin = 0;
ent->skinnum = state.baseline.skin;
ent->skinnum = state.baseline.skinnum;
if (state.baseline.colormod == 255) {
ent->colormod[0] = ent->colormod[1] = ent->colormod[2] = 1.0;
} else {

6
nq/source/sv_main.c
View file

@ -509,7 +509,7 @@ SV_WriteEntitiesToClient (edict_t *clent, sizebuf_t *msg)
if (baseline->colormap != SVfloat (ent, colormap))
bits |= U_COLORMAP;
if (baseline->skin != SVfloat (ent, skin))
if (baseline->skinnum != SVfloat (ent, skin))
bits |= U_SKIN;
if (baseline->frame != SVfloat (ent, frame))
@ -982,7 +982,7 @@ SV_CreateBaseline (void)
VectorCopy (SVvector (svent, origin), baseline->origin);
VectorCopy (SVvector (svent, angles), baseline->angles);
baseline->frame = SVfloat (svent, frame);
baseline->skin = SVfloat (svent, skin);
baseline->skinnum = SVfloat (svent, skin);
if (entnum > 0 && entnum <= svs.maxclients) {
baseline->colormap = entnum;
baseline->modelindex = SV_ModelIndex ("progs/player.mdl");
@ -1034,7 +1034,7 @@ SV_CreateBaseline (void)
else
MSG_WriteByte (&sv.signon, baseline->frame);
MSG_WriteByte (&sv.signon, baseline->colormap);
MSG_WriteByte (&sv.signon, baseline->skin);
MSG_WriteByte (&sv.signon, baseline->skinnum);
MSG_WriteCoordAngleV (&sv.signon, baseline->origin, baseline->angles);

7
qw/include/client.h
View file

@ -201,8 +201,7 @@ extern client_static_t cls;
/*
the client_state_t structure is wiped completely at every server signon
*/
typedef struct
{
typedef struct {
int servercount; // server identification for prespawns
struct info_s *serverinfo;
@ -254,10 +253,10 @@ typedef struct
qboolean paused; // send over by server
float punchangle; // temporar yview kick from weapon firing
float punchangle; // temporary view kick from weapon firing
int intermission; // don't change view angle, full screen, etc
int completed_time; // latched ffrom time at intermission start
int completed_time; // latched from time at intermission start
/* information that is static for the entire time connected to a server */