{0,0,0},//float netcenter[3]; // ! for network prioritization, this is the center of the bounding box (which may differ from the origin)
{0,0,0},//float origin[3];
{0,0,0},//float angles[3];
- 0,//int number; // entity number this state is for
0,//int effects;
+ 0,//unsigned int customizeentityforclient; // !
+ 0,//unsigned short number; // entity number this state is for
0,//unsigned short modelindex;
0,//unsigned short frame;
0,//unsigned short tagentity;
+ 0,//unsigned short specialvisibilityradius; // ! larger if it has effects/light
+ 0,//unsigned short viewmodelforclient; // !
+ 0,//unsigned short exteriormodelforclient; // ! not shown if first person viewing from this entity, shown in all other cases
+ 0,//unsigned short nodrawtoclient; // !
+ 0,//unsigned short drawonlytoclient; // !
{0,0,0,0},//unsigned short light[4]; // color*256 (0.00 to 255.996), and radius*1
0,//unsigned char active; // true if a valid state
0,//unsigned char lightstyle;
0,//unsigned char tagindex;
{32, 32, 32},//unsigned char colormod[3];
// padding to a multiple of 8 bytes (to align the double time)
- 0//unsigned char unused; // !
+ {0,0,0,0,0}//unsigned char unused[5]; // !
};
// LordHavoc: I own protocol ranges 96, 97, 3500-3599
{250, "NEHAHRAMOVIE"},
{15, "QUAKE"},
{28, "QW"},
+ {10000, "NEHAHRABJP"},
+ {10001, "NEHAHRABJP2"},
+ {10002, "NEHAHRABJP3"},
{0, NULL}
};
s.number = num;
s.time = cl.mtime[0];
s.flags = 0;
- if (bits & U_MODEL) s.modelindex = (s.modelindex & 0xFF00) | MSG_ReadByte();
+ if (bits & U_MODEL)
+ {
+ if (cls.protocol == PROTOCOL_NEHAHRABJP || cls.protocol == PROTOCOL_NEHAHRABJP2 || cls.protocol == PROTOCOL_NEHAHRABJP3)
+ s.modelindex = (unsigned short) MSG_ReadShort();
+ else
+ s.modelindex = (s.modelindex & 0xFF00) | MSG_ReadByte();
+ }
if (bits & U_FRAME) s.frame = (s.frame & 0xFF00) | MSG_ReadByte();
if (bits & U_COLORMAP) s.colormap = MSG_ReadByte();
if (bits & U_SKIN) s.skin = MSG_ReadByte();
// packet logs and thus if an update is lost it is never repeated, this makes
// csqc entities useless at the moment.
-void EntityFrameCSQC_WriteState (sizebuf_t *msg, int number, qboolean doupdate, qboolean *sectionstarted)
+void EntityFrameCSQC_WriteState (sizebuf_t *msg, int maxsize, int number, qboolean doupdate, qboolean *sectionstarted)
{
int version;
prvm_eval_t *val, *val2;
version = 0;
if (doupdate)
{
- if (msg->cursize + !*sectionstarted + 2 + 1 + 2 > msg->maxsize)
+ if (msg->cursize + !*sectionstarted + 2 + 1 + 2 > maxsize)
return;
val2 = PRVM_EDICTFIELDVALUE((&prog->edicts[number]), prog->fieldoffsets.Version);
version = (int)val2->_float;
if(!*sectionstarted)
MSG_WriteByte(msg, svc_csqcentities);
MSG_WriteShort(msg, number);
- ((int *)prog->globals.generic)[OFS_PARM0] = sv.writeentitiestoclient_cliententitynumber;
+ msg->allowoverflow = true;
+ PRVM_G_INT(OFS_PARM0) = sv.writeentitiestoclient_cliententitynumber;
prog->globals.server->self = number;
PRVM_ExecuteProgram(val->function, "Null SendEntity\n");
- if(prog->globals.generic[OFS_RETURN])
+ msg->allowoverflow = false;
+ if(PRVM_G_FLOAT(OFS_RETURN))
{
- if (msg->cursize + 2 > msg->maxsize)
+ if (msg->cursize + 2 > maxsize)
{
// if the packet no longer has enough room to write the
// final index code that ends the message, rollback to the
{
// rollback the buffer to its state before the writes
msg->cursize = oldcursize;
+ msg->overflowed = false;
// if the function returned FALSE, simply write a remove
// this is done by falling through to the remove code below
version = 0;
return;
// if there isn't enough room to write the remove message, just return, as
// it will be handled in a later packet
- if (msg->cursize + !*sectionstarted + 2 + 2 > msg->maxsize)
+ if (msg->cursize + !*sectionstarted + 2 + 2 > maxsize)
return;
// first write the message identifier if needed
if(!*sectionstarted)
}
//[515]: we use only one array per-client for SendEntity feature
-void EntityFrameCSQC_WriteFrame (sizebuf_t *msg, int numstates, const entity_state_t *states)
+void EntityFrameCSQC_WriteFrame (sizebuf_t *msg, int maxsize, int numstates, const entity_state_t *states)
{
int i, num;
qboolean sectionstarted = false;
return;
// make sure there is enough room to store the svc_csqcentities byte,
// the terminator (0x0000) and at least one entity update
- if (msg->cursize + 32 >= msg->maxsize)
+ if (msg->cursize + 32 >= maxsize)
return;
num = 1;
// all entities between the previous entity state and this one are dead
for (;num < n->number;num++)
if(svs.clients[sv.writeentitiestoclient_clientnumber].csqcentityversion[num])
- EntityFrameCSQC_WriteState(msg, num, false, §ionstarted);
+ EntityFrameCSQC_WriteState(msg, maxsize, num, false, §ionstarted);
// update this entity
- EntityFrameCSQC_WriteState(msg, num, true, §ionstarted);
+ EntityFrameCSQC_WriteState(msg, maxsize, num, true, §ionstarted);
// advance to next entity so the next iteration doesn't immediately remove it
num++;
}
// all remaining entities are dead
for (;num < prog->num_edicts;num++)
if(svs.clients[sv.writeentitiestoclient_clientnumber].csqcentityversion[num])
- EntityFrameCSQC_WriteState(msg, num, false, §ionstarted);
+ EntityFrameCSQC_WriteState(msg, maxsize, num, false, §ionstarted);
if (sectionstarted)
{
// write index 0 to end the update (0 is never used by real entities)
}
-void EntityFrameQuake_WriteFrame(sizebuf_t *msg, int numstates, const entity_state_t *states)
+void EntityFrameQuake_WriteFrame(sizebuf_t *msg, int maxsize, int numstates, const entity_state_t *states)
{
const entity_state_t *s;
entity_state_t baseline;
if (baseline.modelindex != s->modelindex)
{
bits |= U_MODEL;
- if (s->modelindex & 0xFF00)
+ if ((s->modelindex & 0xFF00) && sv.protocol != PROTOCOL_NEHAHRABJP && sv.protocol != PROTOCOL_NEHAHRABJP2 && sv.protocol != PROTOCOL_NEHAHRABJP3)
bits |= U_MODEL2;
}
if (baseline.alpha != s->alpha)
if (bits & U_LONGENTITY) MSG_WriteShort(&buf, s->number);
else MSG_WriteByte(&buf, s->number);
- if (bits & U_MODEL) MSG_WriteByte(&buf, s->modelindex);
+ if (bits & U_MODEL)
+ {
+ if (sv.protocol == PROTOCOL_NEHAHRABJP || sv.protocol == PROTOCOL_NEHAHRABJP2 || sv.protocol == PROTOCOL_NEHAHRABJP3)
+ MSG_WriteShort(&buf, s->modelindex);
+ else
+ MSG_WriteByte(&buf, s->modelindex);
+ }
if (bits & U_FRAME) MSG_WriteByte(&buf, s->frame);
if (bits & U_COLORMAP) MSG_WriteByte(&buf, s->colormap);
if (bits & U_SKIN) MSG_WriteByte(&buf, s->skin);
}
// if the commit is full, we're done this frame
- if (msg->cursize + buf.cursize > msg->maxsize)
+ if (msg->cursize + buf.cursize > maxsize)
{
// next frame we will continue where we left off
break;
}
// (server) writes a frame to network stream
-void EntityFrame_WriteFrame(sizebuf_t *msg, entityframe_database_t *d, int numstates, const entity_state_t *states, int viewentnum)
+void 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;
EntityFrame4_ResetDatabase(d);
}
-void EntityFrame4_WriteFrame(sizebuf_t *msg, entityframe4_database_t *d, int numstates, const entity_state_t *states)
+void 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;
prvm_eval_t *val;
// if there isn't enough space to accomplish anything, skip it
- if (msg->cursize + 24 > msg->maxsize)
+ if (msg->cursize + 24 > maxsize)
return;
// prepare the buffer
}
}
// if the commit is full, we're done this frame
- if (msg->cursize + buf.cursize > msg->maxsize - 4)
+ if (msg->cursize + buf.cursize > maxsize - 4)
{
// next frame we will continue where we left off
break;
else
{
bits = changedbits;
- if ((bits & E5_ORIGIN) && ((s->flags & RENDER_EXTERIORMODEL) || s->origin[0] < -4096 || s->origin[0] >= 4096 || s->origin[1] < -4096 || s->origin[1] >= 4096 || s->origin[2] < -4096 || s->origin[2] >= 4096))
+ if ((bits & E5_ORIGIN) && ((s->flags & RENDER_EXTERIORMODEL) || s->origin[0] <= -4096.0625 || s->origin[0] >= 4095.9375 || s->origin[1] <= -4096.0625 || s->origin[1] >= 4095.9375 || s->origin[2] <= -4096.0625 || s->origin[2] >= 4095.9375))
bits |= E5_ORIGIN32;
+ // possible values:
+ // negative origin:
+ // (int)(f * 8 - 0.5) >= -32768
+ // (f * 8 - 0.5) > -32769
+ // f > -4096.0625
+ // positive origin:
+ // (int)(f * 8 + 0.5) <= 32767
+ // (f * 8 + 0.5) < 32768
+ // f * 8 + 0.5) < 4095.9375
if ((bits & E5_ANGLES) && !(s->flags & RENDER_LOWPRECISION))
bits |= E5_ANGLES16;
if ((bits & E5_MODEL) && s->modelindex >= 256)
{
d->deltabits[s->number] |= bits;
// if it was a very important update, set priority higher
- if (bits & (E5_FULLUPDATE | E5_ATTACHMENT | E5_MODEL || E5_COLORMAP))
+ if (bits & (E5_FULLUPDATE | E5_ATTACHMENT | E5_MODEL | E5_COLORMAP))
d->priorities[s->number] = max(d->priorities[s->number], 4);
else
d->priorities[s->number] = max(d->priorities[s->number], 1);
d->packetlog[i].packetnumber = 0;
}
-void EntityFrame5_WriteFrame(sizebuf_t *msg, entityframe5_database_t *d, int numstates, const entity_state_t *states, int viewentnum, int movesequence)
+void EntityFrame5_WriteFrame(sizebuf_t *msg, int maxsize, entityframe5_database_t *d, int numstates, const entity_state_t *states, int viewentnum, int movesequence)
{
const entity_state_t *n;
int i, num, l, framenum, packetlognumber, priority;
packetlog->packetnumber = framenum;
packetlog->numstates = 0;
// write stat updates
- 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)
+ if (sv.protocol != PROTOCOL_QUAKE && sv.protocol != PROTOCOL_QUAKEDP && sv.protocol != PROTOCOL_NEHAHRAMOVIE && sv.protocol != PROTOCOL_NEHAHRABJP && sv.protocol != PROTOCOL_NEHAHRABJP2 && sv.protocol != PROTOCOL_NEHAHRABJP3 && sv.protocol != PROTOCOL_DARKPLACES1 && sv.protocol != PROTOCOL_DARKPLACES2 && sv.protocol != PROTOCOL_DARKPLACES3 && sv.protocol != PROTOCOL_DARKPLACES4 && sv.protocol != PROTOCOL_DARKPLACES5)
{
- for (i = 0;i < MAX_CL_STATS && msg->cursize + 6 + 11 <= msg->maxsize;i++)
+ for (i = 0;i < MAX_CL_STATS && msg->cursize + 6 + 11 <= maxsize;i++)
{
if (host_client->statsdeltabits[i>>3] & (1<<(i&7)))
{
buf.cursize = 0;
EntityState5_WriteUpdate(num, n, d->deltabits[num], &buf);
// if the entity won't fit, try the next one
- if (msg->cursize + buf.cursize + 2 > msg->maxsize)
+ if (msg->cursize + buf.cursize + 2 > maxsize)
continue;
// write entity to the packet
SZ_Write(msg, buf.data, buf.cursize);
projects / xonotic / darkplaces.git / blobdiff