mirror of
https://git.code.sf.net/p/quake/quakeforge
synced 2025-06-01 09:02:08 +00:00
move the physent overflow tests to the correct locations
This commit is contained in:
parent
d99da515f7
commit
87d6278a87
1 changed files with 16 additions and 11 deletions
|
@ -898,19 +898,24 @@ CL_SetSolidEntities (void)
|
||||||
pak = &frame->packet_entities;
|
pak = &frame->packet_entities;
|
||||||
|
|
||||||
for (i = 0; i < pak->num_entities; i++) {
|
for (i = 0; i < pak->num_entities; i++) {
|
||||||
if (pmove.numphysent == MAX_PHYSENTS) {
|
|
||||||
Con_Printf ("WARNING: entity physent overflow, email "
|
|
||||||
"quake-devel@lists.sourceforge.net\n");
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
state = &pak->entities[i];
|
state = &pak->entities[i];
|
||||||
|
|
||||||
if (!state->modelindex)
|
if (!state->modelindex)
|
||||||
continue;
|
continue;
|
||||||
if (!cl.model_precache[state->modelindex])
|
if (!cl.model_precache[state->modelindex])
|
||||||
continue;
|
continue;
|
||||||
|
if (pmove.numphysent == MAX_PHYSENTS) {
|
||||||
|
Con_Printf ("WARNING: entity physent overflow, email "
|
||||||
|
"quake-devel@lists.sourceforge.net\n");
|
||||||
|
break;
|
||||||
|
}
|
||||||
if (cl.model_precache[state->modelindex]->hulls[1].firstclipnode
|
if (cl.model_precache[state->modelindex]->hulls[1].firstclipnode
|
||||||
|| cl.model_precache[state->modelindex]->clipbox) {
|
|| cl.model_precache[state->modelindex]->clipbox) {
|
||||||
|
if (pmove.numphysent == MAX_PHYSENTS) {
|
||||||
|
Con_Printf ("WARNING: entity physent overflow, email "
|
||||||
|
"quake-devel@lists.sourceforge.net\n");
|
||||||
|
break;
|
||||||
|
}
|
||||||
pmove.physents[pmove.numphysent].model =
|
pmove.physents[pmove.numphysent].model =
|
||||||
cl.model_precache[state->modelindex];
|
cl.model_precache[state->modelindex];
|
||||||
VectorCopy (state->origin,
|
VectorCopy (state->origin,
|
||||||
|
@ -1003,12 +1008,6 @@ CL_SetSolidPlayers (int playernum)
|
||||||
pent = pmove.physents + pmove.numphysent;
|
pent = pmove.physents + pmove.numphysent;
|
||||||
|
|
||||||
for (j = 0, pplayer = predicted_players; j < MAX_CLIENTS; j++, pplayer++) {
|
for (j = 0, pplayer = predicted_players; j < MAX_CLIENTS; j++, pplayer++) {
|
||||||
if (pmove.numphysent == MAX_PHYSENTS) {
|
|
||||||
Con_Printf ("WARNING: player physent overflow, email "
|
|
||||||
"quake-devel@lists.sourceforge.net\n");
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!pplayer->active)
|
if (!pplayer->active)
|
||||||
continue; // not present this frame
|
continue; // not present this frame
|
||||||
|
|
||||||
|
@ -1019,6 +1018,12 @@ CL_SetSolidPlayers (int playernum)
|
||||||
if (pplayer->flags & PF_DEAD)
|
if (pplayer->flags & PF_DEAD)
|
||||||
continue; // dead players aren't solid
|
continue; // dead players aren't solid
|
||||||
|
|
||||||
|
if (pmove.numphysent == MAX_PHYSENTS) {
|
||||||
|
Con_Printf ("WARNING: player physent overflow, email "
|
||||||
|
"quake-devel@lists.sourceforge.net\n");
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
pent->model = 0;
|
pent->model = 0;
|
||||||
VectorCopy (pplayer->origin, pent->origin);
|
VectorCopy (pplayer->origin, pent->origin);
|
||||||
VectorCopy (player_mins, pent->mins);
|
VectorCopy (player_mins, pent->mins);
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue