X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=protocol.c;h=4a66bfc6e806bbb268b0d31beeeadb18658bb06a;hb=3e7c8230f34c2dd6252e26d595b42b73b9f8dd4c;hp=0c2d844ead120c179ab1025026d8a5c7c70254ef;hpb=adbe84921a19ee5d3e3bb84ad2c0e0c7c597c789;p=xonotic%2Fdarkplaces.git diff --git a/protocol.c b/protocol.c index 0c2d844e..4a66bfc6 100644 --- a/protocol.c +++ b/protocol.c @@ -44,7 +44,6 @@ void EntityFrame_AckFrame(entity_database_t *d, int frame) // (server) clears frame, to prepare for adding entities void EntityFrame_Clear(entity_frame_t *f, vec3_t eye) { - //memset(f, 0, sizeof(*f)); f->time = 0; f->framenum = 0; f->numentities = 0; @@ -481,51 +480,6 @@ void EntityFrame_Read(entity_database_t *d) EntityFrame_AddFrame(d, f); } -/* -// (client) reads (and interpolates) the eye location from the database, -// given a current time -int EntityFrame_FetchEye(entity_database_t *d, vec3_t eye, double time) -{ - float frac; - if (d->numframes == 0) - return false; -// Host_Error("EntityFrame_FetchEye: no frames\n"); - if (d->numframes > 1 && d->frames[d->numframes - 2].time != d->frames[d->numframes - 1].time) - { - frac = (time - d->frames[d->numframes - 2].time) / (d->frames[d->numframes - 1].time - d->frames[d->numframes - 2].time); - frac = bound(0, frac, 1); - VectorSubtract(d->frames[d->numframes - 2].eye, d->frames[d->numframes - 1].eye, eye); - VectorMA(d->frames[d->numframes - 2].eye, frac, eye, eye); - } - else - VectorCopy(d->frames[0].eye, eye); - return true; -} - -// (client) fetchs an entity from a frame, index is the index into the frame's entity list, returns false if index is out of bounds -int EntityFrame_FetchEntityByIndex(entity_frame_t *f, entity_state_t *e, int index) -{ - if (index < 0 || index >= f->numentities) - return false; - memcpy(e, f->entitydata + index, sizeof(*e)); - return true; -} - -int EntityFrame_FetchEntityByNumber(entity_frame_t *f, entity_state_t *e, int number) -{ - int i; - for (i = 0;i < f->numentities;i++) - { - if (f->entitydata[i].number == number) - { - memcpy(e, f->entitydata + i, sizeof(*e)); - return true; - } - } - ClearStateToDefault(e); - return false; -} -*/ // (client) returns the frame number of the most recent frame recieved int EntityFrame_MostRecentlyRecievedFrameNum(entity_database_t *d) @@ -535,3 +489,4 @@ int EntityFrame_MostRecentlyRecievedFrameNum(entity_database_t *d) else return -1; } +