#include "quakedef.h"
-#define E5_PROTOCOL_PRIORITYLEVELS 32
-
// this is 88 bytes (must match entity_state_t in protocol.h)
entity_state_t defaultstate =
{
{15, "QUAKEDP"},
{250, "NEHAHRAMOVIE"},
{15, "QUAKE"},
- {28, "QUAKEWORLD"},
+ {28, "QW"},
{0, NULL}
};
-static entity_frame_t deltaframe; // FIXME?
-static entity_frame_t framedata; // FIXME?
-
-int entityframe5_prioritychaincounts[E5_PROTOCOL_PRIORITYLEVELS];
-unsigned short entityframe5_prioritychains[E5_PROTOCOL_PRIORITYLEVELS][ENTITYFRAME5_MAXSTATES];
-
protocolversion_t Protocol_EnumForName(const char *s)
{
int i;
for (i = 1;protocolversioninfo[i].name;i++)
{
if (i > 1)
- strlcat(buffer, " ", sizeof(buffer));
- strlcat(buffer, protocolversioninfo[i].name, sizeof(buffer));
+ strlcat(buffer, " ", buffersize);
+ strlcat(buffer, protocolversioninfo[i].name, buffersize);
}
}
if (!host_client->netconnection)
return;
// detect changes in stats and write reliable messages
- for (i = 0;i < MAX_CL_STATS;i++)
+ // this only deals with 32 stats because the older protocols which use
+ // this function can only cope with 32 stats,
+ // they also do not support svc_updatestatubyte which was introduced in
+ // DP6 protocol (except for QW)
+ for (i = 0;i < 32;i++)
{
// quickly skip zero bytes
if (!host_client->statsdeltabits[i >> 3])
{
host_client->statsdeltabits[i >> 3] -= (1 << (i & 7));
// send the stat as a byte if possible
- if (host_client->stats[i] >= 0 && host_client->stats[i] < 256)
+ if (sv.protocol == PROTOCOL_QUAKEWORLD)
{
- MSG_WriteByte(&host_client->netconnection->message, svc_updatestatubyte);
- MSG_WriteByte(&host_client->netconnection->message, i);
- MSG_WriteByte(&host_client->netconnection->message, host_client->stats[i]);
+ if (host_client->stats[i] >= 0 && host_client->stats[i] < 256)
+ {
+ MSG_WriteByte(&host_client->netconnection->message, qw_svc_updatestat);
+ MSG_WriteByte(&host_client->netconnection->message, i);
+ MSG_WriteByte(&host_client->netconnection->message, host_client->stats[i]);
+ }
+ else
+ {
+ MSG_WriteByte(&host_client->netconnection->message, qw_svc_updatestatlong);
+ MSG_WriteByte(&host_client->netconnection->message, i);
+ MSG_WriteLong(&host_client->netconnection->message, host_client->stats[i]);
+ }
}
else
{
+ // this could make use of svc_updatestatubyte in DP6 and later
+ // protocols but those protocols do not use this function
MSG_WriteByte(&host_client->netconnection->message, svc_updatestat);
MSG_WriteByte(&host_client->netconnection->message, i);
MSG_WriteLong(&host_client->netconnection->message, host_client->stats[i]);
bits |= U_GLOWSIZE;
if (baseline.glowcolor != s->glowcolor)
bits |= U_GLOWCOLOR;
+ if (!VectorCompare(baseline.colormod, s->colormod))
+ bits |= U_COLORMOD;
// if extensions are disabled, clear the relevant update flags
if (sv.protocol == PROTOCOL_QUAKE || sv.protocol == PROTOCOL_NEHAHRAMOVIE)
MSG_WriteByte (&buf, bits);
if (bits & U_MOREBITS) MSG_WriteByte(&buf, bits>>8);
- if (bits & U_EXTEND1) MSG_WriteByte(&buf, bits>>16);
- if (bits & U_EXTEND2) MSG_WriteByte(&buf, bits>>24);
+ if (sv.protocol != PROTOCOL_NEHAHRAMOVIE)
+ {
+ if (bits & U_EXTEND1) MSG_WriteByte(&buf, bits>>16);
+ if (bits & U_EXTEND2) MSG_WriteByte(&buf, bits>>24);
+ }
if (bits & U_LONGENTITY) MSG_WriteShort(&buf, s->number);
else MSG_WriteByte(&buf, s->number);
void EntityFrame_WriteFrame(sizebuf_t *msg, entityframe_database_t *d, int numstates, const entity_state_t *states, int viewentnum)
{
int i, onum, number;
- entity_frame_t *o = &deltaframe;
+ entity_frame_t *o = &d->deltaframe;
const entity_state_t *ent, *delta;
vec3_t eye;
prvm_eval_t *val;
void EntityFrame_CL_ReadFrame(void)
{
int i, number, removed;
- entity_frame_t *f = &framedata, *delta = &deltaframe;
+ entity_frame_t *f, *delta;
entity_state_t *e, *old, *oldend;
entity_t *ent;
entityframe_database_t *d;
if (!cl.entitydatabase)
cl.entitydatabase = EntityFrame_AllocDatabase(cls.levelmempool);
d = cl.entitydatabase;
+ f = &d->framedata;
+ delta = &d->deltaframe;
EntityFrame_Clear(f, NULL, -1);
entity_state_t *s;
// if it is the player, update urgently
if (stateindex == d->viewentnum)
- return E5_PROTOCOL_PRIORITYLEVELS - 1;
+ return ENTITYFRAME5_PRIORITYLEVELS - 1;
// priority increases each frame no matter what happens
priority = d->priorities[stateindex] + 1;
// players get an extra priority boost
if (!d->states[stateindex].active)
{
priority++;
- return bound(1, priority, E5_PROTOCOL_PRIORITYLEVELS - 1);
+ return bound(1, priority, ENTITYFRAME5_PRIORITYLEVELS - 1);
}
// certain changes are more noticable than others
if (d->deltabits[stateindex] & (E5_FULLUPDATE | E5_ATTACHMENT | E5_MODEL | E5_FLAGS | E5_COLORMAP))
// distance from the player
if (VectorDistance(d->states[d->viewentnum].netcenter, s->netcenter) < 1024.0f)
priority++;
- return bound(1, priority, E5_PROTOCOL_PRIORITYLEVELS - 1);
+ return bound(1, priority, ENTITYFRAME5_PRIORITYLEVELS - 1);
}
void EntityState5_WriteUpdate(int number, const entity_state_t *s, int changedbits, sizebuf_t *msg)
return;
// build lists of entities by priority level
- memset(entityframe5_prioritychaincounts, 0, sizeof(entityframe5_prioritychaincounts));
+ memset(d->prioritychaincounts, 0, sizeof(d->prioritychaincounts));
l = 0;
for (num = 0;num < d->maxedicts;num++)
{
{
if (d->deltabits[num])
{
- if (d->priorities[num] < (E5_PROTOCOL_PRIORITYLEVELS - 1))
+ if (d->priorities[num] < (ENTITYFRAME5_PRIORITYLEVELS - 1))
d->priorities[num] = EntityState5_Priority(d, num);
l = num;
priority = d->priorities[num];
- if (entityframe5_prioritychaincounts[priority] < ENTITYFRAME5_MAXSTATES)
- entityframe5_prioritychains[priority][entityframe5_prioritychaincounts[priority]++] = num;
+ if (d->prioritychaincounts[priority] < ENTITYFRAME5_MAXSTATES)
+ d->prioritychains[priority][d->prioritychaincounts[priority]++] = num;
}
else
d->priorities[num] = 0;
MSG_WriteLong(msg, framenum);
if (sv.protocol != PROTOCOL_QUAKE && sv.protocol != PROTOCOL_QUAKEDP && sv.protocol != PROTOCOL_NEHAHRAMOVIE && sv.protocol != PROTOCOL_DARKPLACES1 && sv.protocol != PROTOCOL_DARKPLACES2 && sv.protocol != PROTOCOL_DARKPLACES3 && sv.protocol != PROTOCOL_DARKPLACES4 && sv.protocol != PROTOCOL_DARKPLACES5 && sv.protocol != PROTOCOL_DARKPLACES6)
MSG_WriteLong(msg, movesequence);
- for (priority = E5_PROTOCOL_PRIORITYLEVELS - 1;priority >= 0 && packetlog->numstates < ENTITYFRAME5_MAXSTATES;priority--)
+ for (priority = ENTITYFRAME5_PRIORITYLEVELS - 1;priority >= 0 && packetlog->numstates < ENTITYFRAME5_MAXSTATES;priority--)
{
- for (i = 0;i < entityframe5_prioritychaincounts[priority] && packetlog->numstates < ENTITYFRAME5_MAXSTATES;i++)
+ for (i = 0;i < d->prioritychaincounts[priority] && packetlog->numstates < ENTITYFRAME5_MAXSTATES;i++)
{
- num = entityframe5_prioritychains[priority][i];
+ num = d->prioritychains[priority][i];
n = d->states + num;
if (d->deltabits[num] & E5_FULLUPDATE)
d->deltabits[num] = E5_FULLUPDATE | EntityState5_DeltaBits(&defaultstate, n);
projects / xonotic / darkplaces.git / blobdiff