X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=sv_send.c;h=a9675530a9f98313657985c7ae2e5cb035134878;hb=ea7ad935aa214b3a52eb7079110e992fbfe750ee;hp=2b5a6c346491e897d3a4ba2c4b77bd0ee3a302c6;hpb=882c947a5fe7634e70355fb0ba530409af5fc9bd;p=xonotic%2Fdarkplaces.git diff --git a/sv_send.c b/sv_send.c index 2b5a6c34..a9675530 100644 --- a/sv_send.c +++ b/sv_send.c @@ -34,6 +34,7 @@ extern cvar_t sv_cullentities_trace_samples_players; extern cvar_t sv_cullentities_trace_eyejitter; extern cvar_t sv_cullentities_trace_expand; extern cvar_t sv_cullentities_trace_delay_players; +extern cvar_t sv_cullentities_trace_spectators; /* ============================================================================= @@ -101,7 +102,7 @@ void SV_BroadcastPrint(const char *msg) } } - if (sv_echobprint.integer && cls.state == ca_dedicated) + if (sv_echobprint.integer && !host_isclient.integer) Con_Print(msg); } @@ -291,7 +292,7 @@ void SV_StartSound (prvm_edict_t *entity, int channel, const char *sample, int n } else MSG_WriteShort (dest, (ent<<3) | channel); - if ((field_mask & SND_LARGESOUND) || sv.protocol == PROTOCOL_NEHAHRABJP2) + if ((field_mask & SND_LARGESOUND) || sv.protocol == PROTOCOL_NEHAHRABJP2 || sv.protocol == PROTOCOL_NEHAHRABJP3) MSG_WriteShort (dest, sound_num); else MSG_WriteByte (dest, sound_num); @@ -402,7 +403,7 @@ static qbool SV_PrepareEntityForSending (prvm_edict_t *ent, entity_state_t *cs, float f; prvm_vec_t *v; vec3_t cullmins, cullmaxs; - dp_model_t *model; + model_t *model; // fast path for games that do not use legacy entity networking // note: still networks clients even if they are legacy @@ -709,7 +710,7 @@ static void SV_PrepareEntitiesForSending(void) memset(sv.sendentitiesindex, 0, prog->num_edicts * sizeof(*sv.sendentitiesindex)); for (e = 1, ent = PRVM_NEXT_EDICT(prog->edicts);e < prog->num_edicts;e++, ent = PRVM_NEXT_EDICT(ent)) { - if (!ent->priv.server->free && SV_PrepareEntityForSending(ent, sv.sendentities + sv.numsendentities, e)) + if (!ent->free && SV_PrepareEntityForSending(ent, sv.sendentities + sv.numsendentities, e)) { sv.sendentitiesindex[e] = sv.sendentities + sv.numsendentities; sv.numsendentities++; @@ -733,7 +734,7 @@ qbool SV_CanSeeBox(int numtraces, vec_t eyejitter, vec_t enlarge, vec_t entboxex int numtouchedicts = 0; int touchindex; matrix4x4_t matrix, imatrix; - dp_model_t *model; + model_t *model; prvm_edict_t *touch; static prvm_edict_t *touchedicts[MAX_EDICTS]; vec3_t eyemins, eyemaxs, start; @@ -859,11 +860,11 @@ qbool SV_CanSeeBox(int numtraces, vec_t eyejitter, vec_t enlarge, vec_t entboxex return false; } -void SV_MarkWriteEntityStateToClient(entity_state_t *s) +void SV_MarkWriteEntityStateToClient(entity_state_t *s, client_t *client) { prvm_prog_t *prog = SVVM_prog; int isbmodel; - dp_model_t *model; + model_t *model; prvm_edict_t *ed; if (sv.sententitiesconsideration[s->number] == sv.sententitiesmark) return; @@ -906,7 +907,7 @@ void SV_MarkWriteEntityStateToClient(entity_state_t *s) // tag attached entities simply check their parent if (!sv.sendentitiesindex[s->tagentity]) return; - SV_MarkWriteEntityStateToClient(sv.sendentitiesindex[s->tagentity]); + SV_MarkWriteEntityStateToClient(sv.sendentitiesindex[s->tagentity], client); if (sv.sententities[s->tagentity] != sv.sententitiesmark) return; } @@ -946,7 +947,7 @@ void SV_MarkWriteEntityStateToClient(entity_state_t *s) } // or not seen by random tracelines - if (sv_cullentities_trace.integer && !isbmodel && sv.worldmodel && sv.worldmodel->brush.TraceLineOfSight && !r_trippy.integer) + if (sv_cullentities_trace.integer && !isbmodel && sv.worldmodel && sv.worldmodel->brush.TraceLineOfSight && !r_trippy.integer && (client->frags != -666 || sv_cullentities_trace_spectators.integer)) { int samples = s->number <= svs.maxclients @@ -955,13 +956,12 @@ void SV_MarkWriteEntityStateToClient(entity_state_t *s) s->specialvisibilityradius ? sv_cullentities_trace_samples_extra.integer : sv_cullentities_trace_samples.integer; - float enlarge = sv_cullentities_trace_enlarge.value; if(samples > 0) { int eyeindex; for (eyeindex = 0;eyeindex < sv.writeentitiestoclient_numeyes;eyeindex++) - if(SV_CanSeeBox(samples, sv_cullentities_trace_eyejitter.value, enlarge, sv_cullentities_trace_expand.value, sv.writeentitiestoclient_eyes[eyeindex], ed->priv.server->cullmins, ed->priv.server->cullmaxs)) + if(SV_CanSeeBox(samples, sv_cullentities_trace_eyejitter.value, sv_cullentities_trace_enlarge.value, sv_cullentities_trace_expand.value, sv.writeentitiestoclient_eyes[eyeindex], ed->priv.server->cullmins, ed->priv.server->cullmaxs)) break; if(eyeindex < sv.writeentitiestoclient_numeyes) svs.clients[sv.writeentitiestoclient_clientnumber].visibletime[s->number] = @@ -970,7 +970,7 @@ void SV_MarkWriteEntityStateToClient(entity_state_t *s) ? sv_cullentities_trace_delay_players.value : sv_cullentities_trace_delay.value ); - else if (host.realtime > svs.clients[sv.writeentitiestoclient_clientnumber].visibletime[s->number]) + else if ((float)host.realtime > svs.clients[sv.writeentitiestoclient_clientnumber].visibletime[s->number]) { sv.writeentitiestoclient_stats_culled_trace++; return; @@ -994,19 +994,16 @@ void SV_AddCameraEyes(void) prvm_prog_t *prog = SVVM_prog; int e, i, j, k; prvm_edict_t *ed; - static int cameras[MAX_LEVELNETWORKEYES]; - static vec3_t camera_origins[MAX_LEVELNETWORKEYES]; - static int eye_levels[MAX_CLIENTNETWORKEYES]; + int cameras[MAX_LEVELNETWORKEYES]; + vec3_t camera_origins[MAX_LEVELNETWORKEYES]; + int eye_levels[MAX_CLIENTNETWORKEYES] = {0}; int n_cameras = 0; vec3_t mi, ma; - for(i = 0; i < sv.writeentitiestoclient_numeyes; ++i) - eye_levels[i] = 0; - // check line of sight to portal entities and add them to PVS for (e = 1, ed = PRVM_NEXT_EDICT(prog->edicts);e < prog->num_edicts;e++, ed = PRVM_NEXT_EDICT(ed)) { - if (!ed->priv.server->free) + if (!ed->free) { if(PRVM_serveredictfunction(ed, camera_transform)) { @@ -1044,7 +1041,12 @@ void SV_AddCameraEyes(void) for(k = 0; k < sv.writeentitiestoclient_numeyes; ++k) if(eye_levels[k] <= MAX_EYE_RECURSION) { - if(SV_CanSeeBox(sv_cullentities_trace_samples.integer, sv_cullentities_trace_eyejitter.value, sv_cullentities_trace_enlarge.value, sv_cullentities_trace_expand.value, sv.writeentitiestoclient_eyes[k], mi, ma)) + if(SV_CanSeeBox(sv_cullentities_trace_samples_extra.integer, sv_cullentities_trace_eyejitter.value, sv_cullentities_trace_enlarge.value, sv_cullentities_trace_expand.value, sv.writeentitiestoclient_eyes[k], mi, ma)) + svs.clients[sv.writeentitiestoclient_clientnumber].visibletime[cameras[j]] = host.realtime + sv_cullentities_trace_delay.value; + + // bones_was_here: this use of visibletime doesn't conflict because sv_cullentities_trace doesn't consider portal entities + // the explicit cast prevents float precision differences that cause the condition to fail + if ((float)host.realtime <= svs.clients[sv.writeentitiestoclient_clientnumber].visibletime[cameras[j]]) { eye_levels[sv.writeentitiestoclient_numeyes] = eye_levels[k] + 1; VectorCopy(camera_origins[j], sv.writeentitiestoclient_eyes[sv.writeentitiestoclient_numeyes]); @@ -1651,7 +1653,7 @@ static void SV_UpdateToReliableMessages (void) if (clientcamera > 0) { int oldclientcamera = host_client->clientcamera; - if (clientcamera >= prog->max_edicts || PRVM_EDICT_NUM(clientcamera)->priv.required->free) + if (clientcamera >= prog->max_edicts || PRVM_EDICT_NUM(clientcamera)->free) clientcamera = PRVM_NUM_FOR_EDICT(host_client->edict); host_client->clientcamera = clientcamera; @@ -1712,7 +1714,7 @@ void SV_SendClientMessages(void) if (host_client->netconnection->message.overflowed) { - SV_DropClient (true); // if the message couldn't send, kick off + SV_DropClient (true, "Buffer overflow in net message"); // if the message couldn't send, kick off continue; }