0,//unsigned char tagindex;
{32, 32, 32},//unsigned char colormod[3];
{32, 32, 32},//unsigned char glowmod[3];
- // padding to a multiple of 8 bytes (to align the double time)
- {0,0}//unsigned char unused[2]; // !
};
// LordHavoc: I own protocol ranges 96, 97, 3500-3599
struct protocolversioninfo_s
{
int number;
+ protocolversion_t version;
const char *name;
}
protocolversioninfo[] =
{
- {0, "UNKNOWN"},
- {3504, "DP7"},
- {3503, "DP6"},
- {3502, "DP5"},
- {3501, "DP4"},
- {3500, "DP3"},
- {97, "DP2"},
- {96, "DP1"},
- {15, "QUAKEDP"},
- {250, "NEHAHRAMOVIE"},
- {15, "QUAKE"},
- {28, "QW"},
- {10000, "NEHAHRABJP"},
- {10001, "NEHAHRABJP2"},
- {10002, "NEHAHRABJP3"},
- {0, NULL}
+ { 3504, PROTOCOL_DARKPLACES7 , "DP7"},
+ { 3503, PROTOCOL_DARKPLACES6 , "DP6"},
+ { 3502, PROTOCOL_DARKPLACES5 , "DP5"},
+ { 3501, PROTOCOL_DARKPLACES4 , "DP4"},
+ { 3500, PROTOCOL_DARKPLACES3 , "DP3"},
+ { 97, PROTOCOL_DARKPLACES2 , "DP2"},
+ { 96, PROTOCOL_DARKPLACES1 , "DP1"},
+ { 15, PROTOCOL_QUAKEDP , "QUAKEDP"},
+ { 15, PROTOCOL_QUAKE , "QUAKE"},
+ { 28, PROTOCOL_QUAKEWORLD , "QW"},
+ { 250, PROTOCOL_NEHAHRAMOVIE, "NEHAHRAMOVIE"},
+ {10000, PROTOCOL_NEHAHRABJP , "NEHAHRABJP"},
+ {10001, PROTOCOL_NEHAHRABJP2 , "NEHAHRABJP2"},
+ {10002, PROTOCOL_NEHAHRABJP3 , "NEHAHRABJP3"},
+ { 0, PROTOCOL_UNKNOWN , NULL}
};
protocolversion_t Protocol_EnumForName(const char *s)
{
int i;
- for (i = 1;protocolversioninfo[i].name;i++)
+ for (i = 0;protocolversioninfo[i].name;i++)
if (!strcasecmp(s, protocolversioninfo[i].name))
- return (protocolversion_t)i;
+ return protocolversioninfo[i].version;
return PROTOCOL_UNKNOWN;
}
const char *Protocol_NameForEnum(protocolversion_t p)
{
- return protocolversioninfo[p].name;
+ int i;
+ for (i = 0;protocolversioninfo[i].name;i++)
+ if (protocolversioninfo[i].version == p)
+ return protocolversioninfo[i].name;
+ return "UNKNOWN";
}
protocolversion_t Protocol_EnumForNumber(int n)
{
int i;
- for (i = 1;protocolversioninfo[i].name;i++)
+ for (i = 0;protocolversioninfo[i].name;i++)
if (protocolversioninfo[i].number == n)
- return (protocolversion_t)i;
+ return protocolversioninfo[i].version;
return PROTOCOL_UNKNOWN;
}
int Protocol_NumberForEnum(protocolversion_t p)
{
- return protocolversioninfo[p].number;
+ int i;
+ for (i = 0;protocolversioninfo[i].name;i++)
+ if (protocolversioninfo[i].version == p)
+ return protocolversioninfo[i].number;
+ return 0;
}
void Protocol_Names(char *buffer, size_t buffersize)
if (buffersize < 1)
return;
buffer[0] = 0;
- for (i = 1;protocolversioninfo[i].name;i++)
+ for (i = 0;protocolversioninfo[i].name;i++)
{
if (i > 1)
strlcat(buffer, " ", buffersize);
void EntityFrameCSQC_LostFrame(client_t *client, int framenum)
{
// marks a frame as lost
- int i, j, n;
+ int i, j;
qboolean valid;
int ringfirst, ringlast;
static int recoversendflags[MAX_EDICTS];
csqcentityframedb_t *d;
- n = client->csqcnumedicts;
-
// is our frame out of history?
ringfirst = client->csqcentityframehistory_next; // oldest entry
ringlast = (ringfirst + NUM_CSQCENTITYDB_FRAMES - 1) % NUM_CSQCENTITYDB_FRAMES; // most recently added entry
}
-qboolean EntityFrameQuake_WriteFrame(sizebuf_t *msg, int maxsize, int numstates, const entity_state_t *states)
+qboolean EntityFrameQuake_WriteFrame(sizebuf_t *msg, int maxsize, int numstates, const entity_state_t **states)
{
const entity_state_t *s;
entity_state_t baseline;
buf.data = data;
buf.maxsize = sizeof(data);
- for (i = 0, s = states;i < numstates;i++, s++)
+ for (i = 0;i < numstates;i++)
{
- ENTITYSIZEPROFILING_START(msg, s->number);
+ ENTITYSIZEPROFILING_START(msg, states[i]->number);
+ s = states[i];
val = PRVM_EDICTFIELDVALUE((&prog->edicts[s->number]), prog->fieldoffsets.SendEntity);
if(val && val->function)
continue;
}
}
-// (server and client) adds a entity_frame to the database, for future reference
-void EntityFrame_AddFrame(entityframe_database_t *d, vec3_t eye, int framenum, int numentities, const entity_state_t *entitydata)
+// (client) adds a entity_frame to the database, for future reference
+void EntityFrame_AddFrame_Client(entityframe_database_t *d, vec3_t eye, int framenum, int numentities, const entity_state_t *entitydata)
+{
+ int n, e;
+ entity_frameinfo_t *info;
+
+ VectorCopy(eye, d->eye);
+
+ // figure out how many entity slots are used already
+ if (d->numframes)
+ {
+ n = d->frames[d->numframes - 1].endentity - d->frames[0].firstentity;
+ if (n + numentities > MAX_ENTITY_DATABASE || d->numframes >= MAX_ENTITY_HISTORY)
+ {
+ // ran out of room, dump database
+ EntityFrame_ClearDatabase(d);
+ }
+ }
+
+ info = &d->frames[d->numframes];
+ info->framenum = framenum;
+ e = -1000;
+ // make sure we check the newly added frame as well, but we haven't incremented numframes yet
+ for (n = 0;n <= d->numframes;n++)
+ {
+ if (e >= d->frames[n].framenum)
+ {
+ if (e == framenum)
+ Con_Print("EntityFrame_AddFrame: tried to add out of sequence frame to database\n");
+ else
+ Con_Print("EntityFrame_AddFrame: out of sequence frames in database\n");
+ return;
+ }
+ e = d->frames[n].framenum;
+ }
+ // if database still has frames after that...
+ if (d->numframes)
+ info->firstentity = d->frames[d->numframes - 1].endentity;
+ else
+ info->firstentity = 0;
+ info->endentity = info->firstentity + numentities;
+ d->numframes++;
+
+ n = info->firstentity % MAX_ENTITY_DATABASE;
+ e = MAX_ENTITY_DATABASE - n;
+ if (e > numentities)
+ e = numentities;
+ memcpy(d->entitydata + n, entitydata, sizeof(entity_state_t) * e);
+ if (numentities > e)
+ memcpy(d->entitydata, entitydata + e, sizeof(entity_state_t) * (numentities - e));
+}
+
+// (server) adds a entity_frame to the database, for future reference
+void EntityFrame_AddFrame_Server(entityframe_database_t *d, vec3_t eye, int framenum, int numentities, const entity_state_t **entitydata)
{
int n, e;
entity_frameinfo_t *info;
}
// (server) writes a frame to network stream
-qboolean EntityFrame_WriteFrame(sizebuf_t *msg, int maxsize, entityframe_database_t *d, int numstates, const entity_state_t *states, int viewentnum)
+qboolean EntityFrame_WriteFrame(sizebuf_t *msg, int maxsize, entityframe_database_t *d, int numstates, const entity_state_t **states, int viewentnum)
{
int i, onum, number;
entity_frame_t *o = &d->deltaframe;
VectorClear(eye);
for (i = 0;i < numstates;i++)
{
- if (states[i].number == viewentnum)
+ ent = states[i];
+ if (ent->number == viewentnum)
{
- VectorSet(eye, states[i].origin[0], states[i].origin[1], states[i].origin[2] + 22);
+ VectorSet(eye, ent->origin[0], ent->origin[1], ent->origin[2] + 22);
break;
}
}
- EntityFrame_AddFrame(d, eye, d->latestframenum, numstates, states);
+ EntityFrame_AddFrame_Server(d, eye, d->latestframenum, numstates, states);
EntityFrame_FetchFrame(d, d->ackframenum, o);
onum = 0;
for (i = 0;i < numstates;i++)
{
- ent = states + i;
+ ent = states[i];
number = ent->number;
val = PRVM_EDICTFIELDVALUE((&prog->edicts[number]), prog->fieldoffsets.SendEntity);
f->entitydata[f->numentities] = *old++;
f->entitydata[f->numentities++].time = cl.mtime[0];
}
- EntityFrame_AddFrame(d, f->eye, f->framenum, f->numentities, f->entitydata);
+ EntityFrame_AddFrame_Client(d, f->eye, f->framenum, f->numentities, f->entitydata);
memset(cl.entities_active, 0, cl.num_entities * sizeof(unsigned char));
number = 1;
EntityFrame4_ResetDatabase(d);
}
-qboolean EntityFrame4_WriteFrame(sizebuf_t *msg, int maxsize, entityframe4_database_t *d, int numstates, const entity_state_t *states)
+qboolean EntityFrame4_WriteFrame(sizebuf_t *msg, int maxsize, entityframe4_database_t *d, int numstates, const entity_state_t **states)
{
const entity_state_t *e, *s;
entity_state_t inactiveentitystate;
SZ_Clear(&buf);
// entity exists, build an update (if empty there is no change)
// find the state in the list
- for (;i < numstates && states[i].number < n;i++);
+ for (;i < numstates && states[i]->number < n;i++);
// make the message
- s = states + i;
+ s = states[i];
if (s->number == n)
{
// build the update
static int EntityState5_Priority(entityframe5_database_t *d, int stateindex)
{
int limit, priority;
- entity_state_t *s;
+ entity_state_t *s = NULL; // hush compiler warning by initializing this
// if it is the player, update urgently
if (stateindex == d->viewentnum)
return ENTITYFRAME5_PRIORITYLEVELS - 1;
d->packetlog[i].packetnumber = 0;
}
-qboolean EntityFrame5_WriteFrame(sizebuf_t *msg, int maxsize, entityframe5_database_t *d, int numstates, const entity_state_t *states, int viewentnum, int movesequence, qboolean need_empty)
+qboolean EntityFrame5_WriteFrame(sizebuf_t *msg, int maxsize, entityframe5_database_t *d, int numstates, const entity_state_t **states, int viewentnum, int movesequence, qboolean need_empty)
{
const entity_state_t *n;
int i, num, l, framenum, packetlognumber, priority;
// detect changes in states
num = 1;
- for (i = 0, n = states;i < numstates;i++, n++)
+ for (i = 0;i < numstates;i++)
{
+ n = states[i];
// mark gaps in entity numbering as removed entities
for (;num < n->number;num++)
{
projects / xonotic / darkplaces.git / blobdiff