qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2025-02-06 15:51:25 +00:00
Code Issues Projects Releases Packages Wiki Activity

Re-enable rendering lights on the player you are viewing from...

Browse source
This commit is contained in:
Ragnvald Maartmann-Moe IV 2002-07-03 00:37:28 +00:00
parent 4bd03bfff3
commit c8fcdd5813
1 changed files with 18 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
qw/source/cl_ents.c
View file

@ -267,7 +267,7 @@ FlushEntityPacket (void)
// read it all, but ignore it // read it all, but ignore it
while (1) { while (1) {
word = (unsigned short) MSG_ReadShort (net_message); word = (unsigned short) MSG_ReadShort (net_message);
if (net_message->badread) { // something didn't parse right... if (net_message->badread) { // something didn't parse right...
Host_Error ("msg_badread in packetentities"); Host_Error ("msg_badread in packetentities");
return; return;
} }
@ -329,12 +329,12 @@ CL_ParsePacketEntities (qboolean delta)
while (1) { while (1) {
word = (unsigned short) MSG_ReadShort (net_message); word = (unsigned short) MSG_ReadShort (net_message);
if (net_message->badread) { // something didn't parse right... if (net_message->badread) { // something didn't parse right...
Host_Error ("msg_badread in packetentities"); Host_Error ("msg_badread in packetentities");
return; return;
} }
if (!word) { // copy rest of ents from old packet if (!word) { // copy rest of ents from old packet
while (oldindex < oldp->num_entities) { while (oldindex < oldp->num_entities) {
if (newindex >= MAX_PACKET_ENTITIES) if (newindex >= MAX_PACKET_ENTITIES)
Host_Error ("CL_ParsePacketEntities: newindex == " Host_Error ("CL_ParsePacketEntities: newindex == "
@ -366,7 +366,7 @@ CL_ParsePacketEntities (qboolean delta)
oldp->entities[oldindex].number; oldp->entities[oldindex].number;
} }
if (newnum < oldnum) { // new from baseline if (newnum < oldnum) { // new from baseline
if (word & U_REMOVE) { if (word & U_REMOVE) {
if (full) { if (full) {
cl.validsequence = 0; cl.validsequence = 0;
@ -386,12 +386,12 @@ CL_ParsePacketEntities (qboolean delta)
continue; continue;
} }
if (newnum == oldnum) { // delta from previous if (newnum == oldnum) { // delta from previous
if (full) { if (full) {
cl.validsequence = 0; cl.validsequence = 0;
Con_Printf ("WARNING: delta on full update"); Con_Printf ("WARNING: delta on full update");
} }
if (word & U_REMOVE) { // Clear the entity if (word & U_REMOVE) { // Clear the entity
entity_t *ent = &cl_packet_ents[newnum]; entity_t *ent = &cl_packet_ents[newnum];
memset (ent, 0, sizeof (entity_t)); memset (ent, 0, sizeof (entity_t));
oldindex++; oldindex++;
@ -512,7 +512,7 @@ CL_LinkPacketEntities (void)
} }
(*ent)->visframe = r_framecount; (*ent)->visframe = r_framecount;
if (model->flags & EF_ROTATE) { // rotate binary objects locally if (model->flags & EF_ROTATE) { // rotate binary objects locally
(*ent)->angles[0] = 0; (*ent)->angles[0] = 0;
(*ent)->angles[1] = anglemod (100 * cl.time); (*ent)->angles[1] = anglemod (100 * cl.time);
(*ent)->angles[2] = 0; (*ent)->angles[2] = 0;
@ -548,7 +548,7 @@ CL_LinkPacketEntities (void)
} }
} }
/* PROJECTILE PARSING / LINKING */ // PROJECTILE PARSING / LINKING ===============================================
void void
CL_ClearProjectiles (void) CL_ClearProjectiles (void)
@ -817,20 +817,11 @@ CL_LinkPlayers (void)
if (ent->efrag) if (ent->efrag)
R_RemoveEfrags (ent); R_RemoveEfrags (ent);
if (state->messagenum != cl.parsecount) if (state->messagenum != cl.parsecount)
continue; // not present this frame continue; // not present this frame
if (!info->name[0]) if (!info->name[0])
continue; continue;
// the player object never gets added
if (j == cl.playernum) {
if (!Cam_DrawPlayer (-1)) // XXX
continue;
} else {
if (!Cam_DrawPlayer (j))
continue;
}
// spawn light flashes, even ones coming from invisible objects // spawn light flashes, even ones coming from invisible objects
if (j == cl.playernum) { if (j == cl.playernum) {
VectorCopy (cl.simorg, org); VectorCopy (cl.simorg, org);
@ -840,6 +831,15 @@ CL_LinkPlayers (void)
CL_NewDlight (j, org, state->effects, state->glow_size, CL_NewDlight (j, org, state->effects, state->glow_size,
state->glow_color); state->glow_color);
// the player object never gets added
if (j == cl.playernum) {
if (!Cam_DrawPlayer (-1)) // XXX
continue;
} else {
if (!Cam_DrawPlayer (j))
continue;
}
if (!state->modelindex) if (!state->modelindex)
continue; continue;