X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=sv_main.c;h=cd283f9e295033955ed3a6583af001d2654da5da;hb=c59fd00b98a29e44bb5951d791f913d0aba1f0fa;hp=1dc26376f23bce324ecb5361977d4af9982cb962;hpb=31c75abac1c901552284edc2d31193a62f302145;p=xonotic%2Fdarkplaces.git diff --git a/sv_main.c b/sv_main.c index 1dc26376..cd283f9e 100644 --- a/sv_main.c +++ b/sv_main.c @@ -219,7 +219,7 @@ void SV_StartSound (edict_t *entity, int channel, char *sample, int volume, else MSG_WriteByte (&sv.datagram, sound_num); for (i=0 ; i<3 ; i++) - MSG_WriteDPCoord (&sv.datagram, entity->v.origin[i]+0.5*(entity->v.mins[i]+entity->v.maxs[i])); + MSG_WriteDPCoord (&sv.datagram, entity->v->origin[i]+0.5*(entity->v->mins[i]+entity->v->maxs[i])); } /* @@ -260,7 +260,7 @@ void SV_SendServerinfo (client_t *client) else MSG_WriteByte (&client->message, GAME_COOP); - sprintf (message, pr_strings+sv.edicts->v.message); + sprintf (message, pr_strings+sv.edicts->v->message); MSG_WriteString (&client->message,message); @@ -274,8 +274,8 @@ void SV_SendServerinfo (client_t *client) // send music MSG_WriteByte (&client->message, svc_cdtrack); - MSG_WriteByte (&client->message, sv.edicts->v.sounds); - MSG_WriteByte (&client->message, sv.edicts->v.sounds); + MSG_WriteByte (&client->message, sv.edicts->v->sounds); + MSG_WriteByte (&client->message, sv.edicts->v->sounds); // set view MSG_WriteByte (&client->message, svc_setview); @@ -383,6 +383,7 @@ void SV_CheckForNewClients (void) SV_ConnectClient (i); net_activeconnections++; + NET_Heartbeat (1); } } @@ -489,7 +490,7 @@ loc0: } // node - recurse down the BSP tree - switch (BOX_ON_PLANE_SIDE(mins, maxs, node->plane)) + switch (BoxOnPlaneSide(mins, maxs, node->plane)) { case 1: // front node = node->children[0]; @@ -518,7 +519,7 @@ SV_WriteEntitiesToClient #ifdef QUAKEENTITIES void SV_WriteEntitiesToClient (client_t *client, edict_t *clent, sizebuf_t *msg) { - int e, clentnum, bits, alpha, glowcolor, glowsize, scale, effects; + int e, clentnum, bits, alpha, glowcolor, glowsize, scale, effects, lightsize; int culled_pvs, culled_portal, culled_trace, visibleentities, totalentities; qbyte *pvs; vec3_t origin, angles, entmins, entmaxs, testorigin, testeye; @@ -532,7 +533,7 @@ void SV_WriteEntitiesToClient (client_t *client, edict_t *clent, sizebuf_t *msg) Mod_CheckLoaded(sv.worldmodel); // find the client's PVS - VectorAdd (clent->v.origin, clent->v.view_ofs, testeye); + VectorAdd (clent->v->origin, clent->v->view_ofs, testeye); pvs = SV_FatPVS (testeye); culled_pvs = 0; @@ -585,9 +586,9 @@ void SV_WriteEntitiesToClient (client_t *client, edict_t *clent, sizebuf_t *msg) if (val->_float != 0) bits |= U_GLOWTRAIL; - if (ent->v.modelindex >= 0 && ent->v.modelindex < MAX_MODELS && pr_strings[ent->v.model]) + if (ent->v->modelindex >= 0 && ent->v->modelindex < MAX_MODELS && pr_strings[ent->v->model]) { - model = sv.models[(int)ent->v.modelindex]; + model = sv.models[(int)ent->v->modelindex]; Mod_CheckLoaded(model); } else @@ -598,17 +599,17 @@ void SV_WriteEntitiesToClient (client_t *client, edict_t *clent, sizebuf_t *msg) continue; } - VectorCopy(ent->v.angles, angles); - if (DotProduct(ent->v.velocity, ent->v.velocity) >= 1.0f) + VectorCopy(ent->v->angles, angles); + if (DotProduct(ent->v->velocity, ent->v->velocity) >= 1.0f) { - VectorMA(ent->v.origin, host_client->latency, ent->v.velocity, origin); + VectorMA(ent->v->origin, host_client->latency, ent->v->velocity, origin); // LordHavoc: trace predicted movement to avoid putting things in walls - trace = SV_Move (ent->v.origin, ent->v.mins, ent->v.maxs, origin, MOVE_NORMAL, ent); + trace = SV_Move (ent->v->origin, ent->v->mins, ent->v->maxs, origin, MOVE_NORMAL, ent); VectorCopy(trace.endpos, origin); } else { - VectorCopy(ent->v.origin, origin); + VectorCopy(ent->v->origin, origin); } // ent has survived every check so far, check if it is visible @@ -624,12 +625,12 @@ void SV_WriteEntitiesToClient (client_t *client, edict_t *clent, sizebuf_t *msg) // using the model's bounding box to ensure things are visible regardless of their physics box if (model) { - if (ent->v.angles[0] || ent->v.angles[2]) // pitch and roll + if (ent->v->angles[0] || ent->v->angles[2]) // pitch and roll { VectorAdd(entmins, model->rotatedmins, entmins); VectorAdd(entmaxs, model->rotatedmaxs, entmaxs); } - else if (ent->v.angles[1]) + else if (ent->v->angles[1]) { VectorAdd(entmins, model->yawmins, entmins); VectorAdd(entmaxs, model->yawmaxs, entmaxs); @@ -693,7 +694,7 @@ void SV_WriteEntitiesToClient (client_t *client, edict_t *clent, sizebuf_t *msg) alphaf = 255.0f; scale = 16; glowcolor = 254; - effects = ent->v.effects; + effects = ent->v->effects; if ((val = GETEDICTFIELDVALUE(ent, eval_alpha))) if (val->_float != 0) @@ -754,7 +755,7 @@ void SV_WriteEntitiesToClient (client_t *client, edict_t *clent, sizebuf_t *msg) // send an update baseline = &ent->baseline; - if (((int)ent->v.effects & EF_DELTA) && sv_deltacompress.integer) + if (((int)ent->v->effects & EF_DELTA) && sv_deltacompress.integer) { // every half second a full update is forced if (realtime < client->nextfullupdate[e]) @@ -774,7 +775,7 @@ void SV_WriteEntitiesToClient (client_t *client, edict_t *clent, sizebuf_t *msg) if (e >= 256) bits |= U_LONGENTITY; - if (ent->v.movetype == MOVETYPE_STEP) + if (ent->v->movetype == MOVETYPE_STEP) bits |= U_STEP; // LordHavoc: old stuff, but rewritten to have more exact tolerances @@ -784,29 +785,29 @@ void SV_WriteEntitiesToClient (client_t *client, edict_t *clent, sizebuf_t *msg) if (((int)(angles[0]*(256.0/360.0)) & 255) != ((int)(baseline->angles[0]*(256.0/360.0)) & 255)) bits |= U_ANGLE1; if (((int)(angles[1]*(256.0/360.0)) & 255) != ((int)(baseline->angles[1]*(256.0/360.0)) & 255)) bits |= U_ANGLE2; if (((int)(angles[2]*(256.0/360.0)) & 255) != ((int)(baseline->angles[2]*(256.0/360.0)) & 255)) bits |= U_ANGLE3; - if (baseline->colormap != (qbyte) ent->v.colormap) bits |= U_COLORMAP; - if (baseline->skin != (qbyte) ent->v.skin) bits |= U_SKIN; - if ((baseline->frame & 0x00FF) != ((int) ent->v.frame & 0x00FF)) bits |= U_FRAME; - if ((baseline->effects & 0x00FF) != ((int) ent->v.effects & 0x00FF)) bits |= U_EFFECTS; - if ((baseline->modelindex & 0x00FF) != ((int) ent->v.modelindex & 0x00FF)) bits |= U_MODEL; + if (baseline->colormap != (qbyte) ent->v->colormap) bits |= U_COLORMAP; + if (baseline->skin != (qbyte) ent->v->skin) bits |= U_SKIN; + if ((baseline->frame & 0x00FF) != ((int) ent->v->frame & 0x00FF)) bits |= U_FRAME; + if ((baseline->effects & 0x00FF) != ((int) ent->v->effects & 0x00FF)) bits |= U_EFFECTS; + if ((baseline->modelindex & 0x00FF) != ((int) ent->v->modelindex & 0x00FF)) bits |= U_MODEL; // LordHavoc: new stuff if (baseline->alpha != alpha) bits |= U_ALPHA; if (baseline->scale != scale) bits |= U_SCALE; - if (((int) baseline->effects & 0xFF00) != ((int) ent->v.effects & 0xFF00)) bits |= U_EFFECTS2; + if (((int) baseline->effects & 0xFF00) != ((int) ent->v->effects & 0xFF00)) bits |= U_EFFECTS2; if (baseline->glowsize != glowsize) bits |= U_GLOWSIZE; if (baseline->glowcolor != glowcolor) bits |= U_GLOWCOLOR; - if (((int) baseline->frame & 0xFF00) != ((int) ent->v.frame & 0xFF00)) bits |= U_FRAME2; - if (((int) baseline->frame & 0xFF00) != ((int) ent->v.modelindex & 0xFF00)) bits |= U_MODEL2; + if (((int) baseline->frame & 0xFF00) != ((int) ent->v->frame & 0xFF00)) bits |= U_FRAME2; + if (((int) baseline->frame & 0xFF00) != ((int) ent->v->modelindex & 0xFF00)) bits |= U_MODEL2; // update delta baseline - VectorCopy(ent->v.origin, ent->deltabaseline.origin); - VectorCopy(ent->v.angles, ent->deltabaseline.angles); - ent->deltabaseline.colormap = ent->v.colormap; - ent->deltabaseline.skin = ent->v.skin; - ent->deltabaseline.frame = ent->v.frame; - ent->deltabaseline.effects = ent->v.effects; - ent->deltabaseline.modelindex = ent->v.modelindex; + VectorCopy(ent->v->origin, ent->deltabaseline.origin); + VectorCopy(ent->v->angles, ent->deltabaseline.angles); + ent->deltabaseline.colormap = ent->v->colormap; + ent->deltabaseline.skin = ent->v->skin; + ent->deltabaseline.frame = ent->v->frame; + ent->deltabaseline.effects = ent->v->effects; + ent->deltabaseline.modelindex = ent->v->modelindex; ent->deltabaseline.alpha = alpha; ent->deltabaseline.scale = scale; ent->deltabaseline.glowsize = glowsize; @@ -835,11 +836,11 @@ void SV_WriteEntitiesToClient (client_t *client, edict_t *clent, sizebuf_t *msg) MSG_WriteShort (msg,e); else MSG_WriteByte (msg,e); - if (bits & U_MODEL) MSG_WriteByte (msg, ent->v.modelindex); - if (bits & U_FRAME) MSG_WriteByte (msg, ent->v.frame); - if (bits & U_COLORMAP) MSG_WriteByte (msg, ent->v.colormap); - if (bits & U_SKIN) MSG_WriteByte (msg, ent->v.skin); - if (bits & U_EFFECTS) MSG_WriteByte (msg, ent->v.effects); + if (bits & U_MODEL) MSG_WriteByte (msg, ent->v->modelindex); + if (bits & U_FRAME) MSG_WriteByte (msg, ent->v->frame); + if (bits & U_COLORMAP) MSG_WriteByte (msg, ent->v->colormap); + if (bits & U_SKIN) MSG_WriteByte (msg, ent->v->skin); + if (bits & U_EFFECTS) MSG_WriteByte (msg, ent->v->effects); if (bits & U_ORIGIN1) MSG_WriteDPCoord (msg, origin[0]); if (bits & U_ANGLE1) MSG_WriteAngle(msg, angles[0]); if (bits & U_ORIGIN2) MSG_WriteDPCoord (msg, origin[1]); @@ -850,11 +851,11 @@ void SV_WriteEntitiesToClient (client_t *client, edict_t *clent, sizebuf_t *msg) // LordHavoc: new stuff if (bits & U_ALPHA) MSG_WriteByte(msg, alpha); if (bits & U_SCALE) MSG_WriteByte(msg, scale); - if (bits & U_EFFECTS2) MSG_WriteByte(msg, (int)ent->v.effects >> 8); + if (bits & U_EFFECTS2) MSG_WriteByte(msg, (int)ent->v->effects >> 8); if (bits & U_GLOWSIZE) MSG_WriteByte(msg, glowsize); if (bits & U_GLOWCOLOR) MSG_WriteByte(msg, glowcolor); - if (bits & U_FRAME2) MSG_WriteByte(msg, (int)ent->v.frame >> 8); - if (bits & U_MODEL2) MSG_WriteByte(msg, (int)ent->v.modelindex >> 8); + if (bits & U_FRAME2) MSG_WriteByte(msg, (int)ent->v->frame >> 8); + if (bits & U_MODEL2) MSG_WriteByte(msg, (int)ent->v->modelindex >> 8); } if (sv_cullentities_stats.integer) @@ -863,11 +864,11 @@ void SV_WriteEntitiesToClient (client_t *client, edict_t *clent, sizebuf_t *msg) #else void SV_WriteEntitiesToClient (client_t *client, edict_t *clent, sizebuf_t *msg) { - int e, clentnum, flags, alpha, glowcolor, glowsize, scale, effects; + int e, clentnum, flags, alpha, glowcolor, glowsize, scale, effects, modelindex; int culled_pvs, culled_portal, culled_trace, visibleentities, totalentities; - float alphaf; + float alphaf, lightsize; qbyte *pvs; - vec3_t origin, angles, entmins, entmaxs, testorigin, testeye; + vec3_t origin, angles, entmins, entmaxs, lightmins, lightmaxs, testorigin, testeye; edict_t *ent; eval_t *val; trace_t trace; @@ -881,9 +882,19 @@ void SV_WriteEntitiesToClient (client_t *client, edict_t *clent, sizebuf_t *msg) Mod_CheckLoaded(sv.worldmodel); // find the client's PVS - VectorAdd (clent->v.origin, clent->v.view_ofs, testeye); + // the real place being tested from + VectorAdd (clent->v->origin, clent->v->view_ofs, testeye); pvs = SV_FatPVS (testeye); - EntityFrame_Clear(&entityframe, testeye); + + // the place being reported (to consider the fact the client still + // applies the view_ofs[2], so we have to only send the fractional part + // of view_ofs[2], undoing what the client will redo) + VectorCopy (testeye, testorigin); + e = (int) clent->v->view_ofs[2] & 255; + if (e >= 128) + e -= 256; + testorigin[2] -= (float) e; + EntityFrame_Clear(&entityframe, testorigin); culled_pvs = 0; culled_portal = 0; @@ -896,6 +907,8 @@ void SV_WriteEntitiesToClient (client_t *client, edict_t *clent, sizebuf_t *msg) ent = NEXT_EDICT(sv.edicts); for (e = 1;e < sv.num_edicts;e++, ent = NEXT_EDICT(ent)) { + if (ent->free) + continue; flags = 0; if (ent != clent) // LordHavoc: always send player @@ -921,39 +934,67 @@ void SV_WriteEntitiesToClient (client_t *client, edict_t *clent, sizebuf_t *msg) } glowsize = 0; - + effects = ent->v->effects; if ((val = GETEDICTFIELDVALUE(ent, eval_glow_size))) glowsize = (int) val->_float >> 2; glowsize = bound(0, glowsize, 255); + lightsize = 0; + if (effects & (EF_BRIGHTFIELD | EF_MUZZLEFLASH | EF_BRIGHTLIGHT | EF_DIMLIGHT | EF_RED | EF_BLUE | EF_FLAME | EF_STARDUST)) + { + if (effects & EF_BRIGHTFIELD) + lightsize = max(lightsize, 80); + if (effects & EF_MUZZLEFLASH) + lightsize = max(lightsize, 100); + if (effects & EF_BRIGHTLIGHT) + lightsize = max(lightsize, 400); + if (effects & EF_DIMLIGHT) + lightsize = max(lightsize, 200); + if (effects & EF_RED) + lightsize = max(lightsize, 200); + if (effects & EF_BLUE) + lightsize = max(lightsize, 200); + if (effects & EF_FLAME) + lightsize = max(lightsize, 250); + if (effects & EF_STARDUST) + lightsize = max(lightsize, 100); + } + if (glowsize) + lightsize = max(lightsize, glowsize << 2); + if ((val = GETEDICTFIELDVALUE(ent, eval_glow_trail))) if (val->_float != 0) + { flags |= RENDER_GLOWTRAIL; + lightsize = max(lightsize, 100); + } - if (ent->v.modelindex >= 0 && ent->v.modelindex < MAX_MODELS && pr_strings[ent->v.model]) + modelindex = 0; + if (ent->v->modelindex >= 0 && ent->v->modelindex < MAX_MODELS && pr_strings[ent->v->model]) { - model = sv.models[(int)ent->v.modelindex]; + modelindex = ent->v->modelindex; + model = sv.models[(int)ent->v->modelindex]; Mod_CheckLoaded(model); } else { model = NULL; if (ent != clent) // LordHavoc: always send player - if (glowsize == 0 && (flags & RENDER_GLOWTRAIL) == 0) // no effects + if (lightsize == 0) // no effects continue; } - VectorCopy(ent->v.angles, angles); - if (DotProduct(ent->v.velocity, ent->v.velocity) >= 1.0f && host_client->latency >= 0.01f) + VectorCopy(ent->v->angles, angles); + if (DotProduct(ent->v->velocity, ent->v->velocity) >= 1.0f && host_client->latency >= 0.01f) { - VectorMA(ent->v.origin, host_client->latency, ent->v.velocity, origin); + VectorMA(ent->v->origin, host_client->latency, ent->v->velocity, origin); // LordHavoc: trace predicted movement to avoid putting things in walls - trace = SV_Move (ent->v.origin, ent->v.mins, ent->v.maxs, origin, MOVE_NORMAL, ent); + trace = SV_Move (ent->v->origin, ent->v->mins, ent->v->maxs, origin, MOVE_NORMAL, ent); VectorCopy(trace.endpos, origin); } else { - VectorCopy(ent->v.origin, origin); + VectorCopy(ent->v->origin, origin); } // ent has survived every check so far, check if it is visible @@ -970,12 +1011,12 @@ void SV_WriteEntitiesToClient (client_t *client, edict_t *clent, sizebuf_t *msg) // using the model's bounding box to ensure things are visible regardless of their physics box if (model) { - if (ent->v.angles[0] || ent->v.angles[2]) // pitch and roll + if (ent->v->angles[0] || ent->v->angles[2]) // pitch and roll { VectorAdd(entmins, model->rotatedmins, entmins); VectorAdd(entmaxs, model->rotatedmaxs, entmaxs); } - else if (ent->v.angles[1]) + else if (ent->v->angles[1]) { VectorAdd(entmins, model->yawmins, entmins); VectorAdd(entmaxs, model->yawmaxs, entmaxs); @@ -986,18 +1027,24 @@ void SV_WriteEntitiesToClient (client_t *client, edict_t *clent, sizebuf_t *msg) VectorAdd(entmaxs, model->normalmaxs, entmaxs); } } + lightmins[0] = min(entmins[0], origin[0] - lightsize); + lightmins[1] = min(entmins[1], origin[1] - lightsize); + lightmins[2] = min(entmins[2], origin[2] - lightsize); + lightmaxs[0] = min(entmaxs[0], origin[0] + lightsize); + lightmaxs[1] = min(entmaxs[1], origin[1] + lightsize); + lightmaxs[2] = min(entmaxs[2], origin[2] + lightsize); totalentities++; // if not touching a visible leaf - if (sv_cullentities_pvs.integer && !SV_BoxTouchingPVS(pvs, entmins, entmaxs, sv.worldmodel->nodes)) + if (sv_cullentities_pvs.integer && !SV_BoxTouchingPVS(pvs, lightmins, lightmaxs, sv.worldmodel->nodes)) { culled_pvs++; continue; } // or not visible through the portals - if (sv_cullentities_portal.integer && !Portal_CheckBox(sv.worldmodel, testeye, entmins, entmaxs)) + if (sv_cullentities_portal.integer && !Portal_CheckBox(sv.worldmodel, testeye, lightmins, lightmaxs)) { culled_portal++; continue; @@ -1005,21 +1052,50 @@ void SV_WriteEntitiesToClient (client_t *client, edict_t *clent, sizebuf_t *msg) if (sv_cullentities_trace.integer) { - // LordHavoc: test random offsets, to maximize chance of detection - testorigin[0] = lhrandom(entmins[0], entmaxs[0]); - testorigin[1] = lhrandom(entmins[1], entmaxs[1]); - testorigin[2] = lhrandom(entmins[2], entmaxs[2]); - + // LordHavoc: test center first + testorigin[0] = (entmins[0] + entmaxs[0]) * 0.5f; + testorigin[1] = (entmins[1] + entmaxs[1]) * 0.5f; + testorigin[2] = (entmins[2] + entmaxs[2]) * 0.5f; Collision_ClipTrace(&trace, NULL, sv.worldmodel, vec3_origin, vec3_origin, vec3_origin, vec3_origin, testeye, vec3_origin, vec3_origin, testorigin); - if (trace.fraction == 1) client->visibletime[e] = realtime + 1; else { - if (realtime > client->visibletime[e]) + // LordHavoc: test random offsets, to maximize chance of detection + testorigin[0] = lhrandom(entmins[0], entmaxs[0]); + testorigin[1] = lhrandom(entmins[1], entmaxs[1]); + testorigin[2] = lhrandom(entmins[2], entmaxs[2]); + Collision_ClipTrace(&trace, NULL, sv.worldmodel, vec3_origin, vec3_origin, vec3_origin, vec3_origin, testeye, vec3_origin, vec3_origin, testorigin); + if (trace.fraction == 1) + client->visibletime[e] = realtime + 1; + else { - culled_trace++; - continue; + if (lightsize) + { + // LordHavoc: test random offsets, to maximize chance of detection + testorigin[0] = lhrandom(lightmins[0], lightmaxs[0]); + testorigin[1] = lhrandom(lightmins[1], lightmaxs[1]); + testorigin[2] = lhrandom(lightmins[2], lightmaxs[2]); + Collision_ClipTrace(&trace, NULL, sv.worldmodel, vec3_origin, vec3_origin, vec3_origin, vec3_origin, testeye, vec3_origin, vec3_origin, testorigin); + if (trace.fraction == 1) + client->visibletime[e] = realtime + 1; + else + { + if (realtime > client->visibletime[e]) + { + culled_trace++; + continue; + } + } + } + else + { + if (realtime > client->visibletime[e]) + { + culled_trace++; + continue; + } + } } } } @@ -1029,7 +1105,7 @@ void SV_WriteEntitiesToClient (client_t *client, edict_t *clent, sizebuf_t *msg) alphaf = 255.0f; scale = 16; glowcolor = 254; - effects = ent->v.effects; + effects = ent->v->effects; if ((val = GETEDICTFIELDVALUE(ent, eval_alpha))) if (val->_float != 0) @@ -1059,7 +1135,7 @@ void SV_WriteEntitiesToClient (client_t *client, edict_t *clent, sizebuf_t *msg) if (ent != clent) { - if (glowsize == 0 && (flags & RENDER_GLOWTRAIL) == 0) // no effects + if (lightsize == 0) // no effects { if (model) // model { @@ -1075,7 +1151,7 @@ void SV_WriteEntitiesToClient (client_t *client, edict_t *clent, sizebuf_t *msg) if ((val = GETEDICTFIELDVALUE(ent, eval_exteriormodeltoclient)) && val->edict == clentnum) flags |= RENDER_EXTERIORMODEL; - if (ent->v.movetype == MOVETYPE_STEP) + if (ent->v->movetype == MOVETYPE_STEP) flags |= RENDER_STEP; // don't send an entity if it's coordinates would wrap around if ((effects & EF_LOWPRECISION) && origin[0] >= -32768 && origin[1] >= -32768 && origin[2] >= -32768 && origin[0] <= 32767 && origin[1] <= 32767 && origin[2] <= 32767) @@ -1087,10 +1163,12 @@ void SV_WriteEntitiesToClient (client_t *client, edict_t *clent, sizebuf_t *msg) break; VectorCopy(origin, s->origin); VectorCopy(angles, s->angles); - s->colormap = ent->v.colormap; - s->skin = ent->v.skin; - s->frame = ent->v.frame; - s->modelindex = ent->v.modelindex; + if (ent->v->colormap >= 1024) + flags |= RENDER_COLORMAPPED; + s->colormap = ent->v->colormap; + s->skin = ent->v->skin; + s->frame = ent->v->frame; + s->modelindex = modelindex; s->effects = effects; s->alpha = alpha; s->scale = scale; @@ -1119,7 +1197,7 @@ void SV_CleanupEnts (void) ent = NEXT_EDICT(sv.edicts); for (e=1 ; ev.effects = (int)ent->v.effects & ~EF_MUZZLEFLASH; + ent->v->effects = (int)ent->v->effects & ~EF_MUZZLEFLASH; } /* @@ -1141,17 +1219,17 @@ void SV_WriteClientdataToMessage (edict_t *ent, sizebuf_t *msg) // // send a damage message // - if (ent->v.dmg_take || ent->v.dmg_save) + if (ent->v->dmg_take || ent->v->dmg_save) { - other = PROG_TO_EDICT(ent->v.dmg_inflictor); + other = PROG_TO_EDICT(ent->v->dmg_inflictor); MSG_WriteByte (msg, svc_damage); - MSG_WriteByte (msg, ent->v.dmg_save); - MSG_WriteByte (msg, ent->v.dmg_take); + MSG_WriteByte (msg, ent->v->dmg_save); + MSG_WriteByte (msg, ent->v->dmg_take); for (i=0 ; i<3 ; i++) - MSG_WriteDPCoord (msg, other->v.origin[i] + 0.5*(other->v.mins[i] + other->v.maxs[i])); + MSG_WriteDPCoord (msg, other->v->origin[i] + 0.5*(other->v->mins[i] + other->v->maxs[i])); - ent->v.dmg_take = 0; - ent->v.dmg_save = 0; + ent->v->dmg_take = 0; + ent->v->dmg_save = 0; } // @@ -1160,19 +1238,20 @@ void SV_WriteClientdataToMessage (edict_t *ent, sizebuf_t *msg) SV_SetIdealPitch (); // how much to look up / down ideally // a fixangle might get lost in a dropped packet. Oh well. - if ( ent->v.fixangle ) + if ( ent->v->fixangle ) { MSG_WriteByte (msg, svc_setangle); for (i=0 ; i < 3 ; i++) - MSG_WriteAngle (msg, ent->v.angles[i] ); - ent->v.fixangle = 0; + MSG_WriteAngle (msg, ent->v->angles[i] ); + ent->v->fixangle = 0; } bits = 0; - bits |= SU_VIEWHEIGHT; + if (ent->v->view_ofs[2] != DEFAULT_VIEWHEIGHT) + bits |= SU_VIEWHEIGHT; - if (ent->v.idealpitch) + if (ent->v->idealpitch) bits |= SU_IDEALPITCH; // stuff the sigil bits into the high bits of items for sbar, or else @@ -1180,16 +1259,16 @@ void SV_WriteClientdataToMessage (edict_t *ent, sizebuf_t *msg) val = GETEDICTFIELDVALUE(ent, eval_items2); if (val) - items = (int)ent->v.items | ((int)val->_float << 23); + items = (int)ent->v->items | ((int)val->_float << 23); else - items = (int)ent->v.items | ((int)pr_global_struct->serverflags << 28); + items = (int)ent->v->items | ((int)pr_global_struct->serverflags << 28); bits |= SU_ITEMS; - if ( (int)ent->v.flags & FL_ONGROUND) + if ( (int)ent->v->flags & FL_ONGROUND) bits |= SU_ONGROUND; - if ( ent->v.waterlevel >= 2) + if ( ent->v->waterlevel >= 2) bits |= SU_INWATER; // dpprotocol @@ -1213,18 +1292,18 @@ void SV_WriteClientdataToMessage (edict_t *ent, sizebuf_t *msg) for (i=0 ; i<3 ; i++) { - if (ent->v.punchangle[i]) + if (ent->v->punchangle[i]) bits |= (SU_PUNCH1<v.velocity[i]) + if (ent->v->velocity[i]) bits |= (SU_VELOCITY1<v.weaponframe) + if (ent->v->weaponframe) bits |= SU_WEAPONFRAME; - if (ent->v.armorvalue) + if (ent->v->armorvalue) bits |= SU_ARMOR; bits |= SU_WEAPON; @@ -1244,44 +1323,43 @@ void SV_WriteClientdataToMessage (edict_t *ent, sizebuf_t *msg) MSG_WriteByte(msg, bits >> 24); if (bits & SU_VIEWHEIGHT) - //MSG_WriteChar (msg, ent->v.view_ofs[2]); - MSG_WriteChar (msg, 0); + MSG_WriteChar (msg, ent->v->view_ofs[2]); if (bits & SU_IDEALPITCH) - MSG_WriteChar (msg, ent->v.idealpitch); + MSG_WriteChar (msg, ent->v->idealpitch); for (i=0 ; i<3 ; i++) { if (bits & (SU_PUNCH1<v.punchangle[i]); // dpprotocol + MSG_WritePreciseAngle(msg, ent->v->punchangle[i]); // dpprotocol if (bits & (SU_PUNCHVEC1<v.velocity[i]/16); + MSG_WriteChar (msg, ent->v->velocity[i]/16); } // [always sent] if (bits & SU_ITEMS) MSG_WriteLong (msg, items); if (bits & SU_WEAPONFRAME) - MSG_WriteByte (msg, ent->v.weaponframe); + MSG_WriteByte (msg, ent->v->weaponframe); if (bits & SU_ARMOR) - MSG_WriteByte (msg, ent->v.armorvalue); + MSG_WriteByte (msg, ent->v->armorvalue); if (bits & SU_WEAPON) - MSG_WriteByte (msg, SV_ModelIndex(pr_strings+ent->v.weaponmodel)); + MSG_WriteByte (msg, SV_ModelIndex(pr_strings+ent->v->weaponmodel)); - MSG_WriteShort (msg, ent->v.health); - MSG_WriteByte (msg, ent->v.currentammo); - MSG_WriteByte (msg, ent->v.ammo_shells); - MSG_WriteByte (msg, ent->v.ammo_nails); - MSG_WriteByte (msg, ent->v.ammo_rockets); - MSG_WriteByte (msg, ent->v.ammo_cells); + MSG_WriteShort (msg, ent->v->health); + MSG_WriteByte (msg, ent->v->currentammo); + MSG_WriteByte (msg, ent->v->ammo_shells); + MSG_WriteByte (msg, ent->v->ammo_nails); + MSG_WriteByte (msg, ent->v->ammo_rockets); + MSG_WriteByte (msg, ent->v->ammo_cells); if (gamemode == GAME_HIPNOTIC || gamemode == GAME_ROGUE) { for(i=0;i<32;i++) { - if ( ((int)ent->v.weapon) & (1<v->weapon) & (1<v.weapon); + MSG_WriteByte (msg, ent->v->weapon); } if (bits & SU_VIEWZOOM) @@ -1349,7 +1427,7 @@ void SV_UpdateToReliableMessages (void) // check for changes to be sent over the reliable streams for (i=0, host_client = svs.clients ; iold_frags != host_client->edict->v.frags) + if (host_client->old_frags != host_client->edict->v->frags) { for (j=0, client = svs.clients ; jmessage, svc_updatefrags); MSG_WriteByte (&client->message, i); - MSG_WriteShort (&client->message, host_client->edict->v.frags); + MSG_WriteShort (&client->message, host_client->edict->v->frags); } - host_client->old_frags = host_client->edict->v.frags; + host_client->old_frags = host_client->edict->v->frags; } } @@ -1493,9 +1571,9 @@ SV_ModelIndex ================ */ -int SV_ModelIndex (char *name) +int SV_ModelIndex (const char *name) { - int i; + int i; if (!name || !name[0]) return 0; @@ -1531,14 +1609,14 @@ void SV_CreateBaseline (void) if (svent->free) continue; - if (entnum > svs.maxclients && !svent->v.modelindex) + if (entnum > svs.maxclients && !svent->v->modelindex) continue; // create entity baseline - VectorCopy (svent->v.origin, svent->baseline.origin); - VectorCopy (svent->v.angles, svent->baseline.angles); - svent->baseline.frame = svent->v.frame; - svent->baseline.skin = svent->v.skin; + VectorCopy (svent->v->origin, svent->baseline.origin); + VectorCopy (svent->v->angles, svent->baseline.angles); + svent->baseline.frame = svent->v->frame; + svent->baseline.skin = svent->v->skin; if (entnum > 0 && entnum <= svs.maxclients) { svent->baseline.colormap = entnum; @@ -1547,7 +1625,7 @@ void SV_CreateBaseline (void) else { svent->baseline.colormap = 0; - svent->baseline.modelindex = svent->v.modelindex; + svent->baseline.modelindex = svent->v->modelindex; } large = false; @@ -1602,7 +1680,7 @@ void SV_SendReconnect (void) MSG_WriteChar (&msg, svc_stufftext); MSG_WriteString (&msg, "reconnect\n"); NET_SendToAll (&msg, 5); - + if (cls.state != ca_dedicated) Cmd_ExecuteString ("reconnect\n", src_command); } @@ -1644,7 +1722,7 @@ This is called at the start of each level */ extern float scr_centertime_off; -void SV_SpawnServer (char *server) +void SV_SpawnServer (const char *server) { edict_t *ent; int i; @@ -1689,7 +1767,15 @@ void SV_SpawnServer (char *server) // clear the edict memory pool Mem_EmptyPool(sv_edicts_mempool); - sv.edicts = Mem_Alloc(sv_edicts_mempool, sv.max_edicts * pr_edict_size); + sv.edicts = Mem_Alloc(sv_edicts_mempool, sv.max_edicts * sizeof(edict_t)); + sv.edictsfields = Mem_Alloc(sv_edicts_mempool, sv.max_edicts * pr_edict_size); + sv.edictstable = Mem_Alloc(sv_edicts_mempool, sv.max_edicts * sizeof(edict_t *)); + for (i = 0;i < MAX_EDICTS;i++) + { + ent = sv.edicts + i; + ent->v = (void *)((qbyte *)sv.edictsfields + i * pr_edict_size); + sv.edictstable[i] = ent; + } sv.datagram.maxsize = sizeof(sv.datagram_buf); sv.datagram.cursize = 0; @@ -1748,12 +1834,12 @@ void SV_SpawnServer (char *server) // load the rest of the entities // ent = EDICT_NUM(0); - memset (&ent->v, 0, progs->entityfields * 4); + memset (ent->v, 0, progs->entityfields * 4); ent->free = false; - ent->v.model = sv.worldmodel->name - pr_strings; - ent->v.modelindex = 1; // world model - ent->v.solid = SOLID_BSP; - ent->v.movetype = MOVETYPE_PUSH; + ent->v->model = sv.worldmodel->name - pr_strings; + ent->v->modelindex = 1; // world model + ent->v->solid = SOLID_BSP; + ent->v->movetype = MOVETYPE_PUSH; if (coop.integer) pr_global_struct->coop = coop.integer; @@ -1767,7 +1853,7 @@ void SV_SpawnServer (char *server) ED_LoadFromFile (sv.worldmodel->entities); // LordHavoc: clear world angles (to fix e3m3.bsp) - VectorClear(sv.edicts->v.angles); + VectorClear(sv.edicts->v->angles); sv.active = true; @@ -1793,5 +1879,6 @@ void SV_SpawnServer (char *server) SV_SendServerinfo (host_client); Con_DPrintf ("Server spawned.\n"); + NET_Heartbeat (2); }