cl_ents.c:

bring back the location markers
sv_ccmds.c:
	a few demo related fixes
sv_demo.c:
	minor cleanups
This commit is contained in:
Bill Currie 2004-03-23 22:39:17 +00:00
parent 826453a992
commit 16a90e17f2
3 changed files with 30 additions and 14 deletions

View file

@ -40,6 +40,7 @@ static __attribute__ ((unused)) const char rcsid[] =
#include "QF/console.h" #include "QF/console.h"
#include "QF/cvar.h" #include "QF/cvar.h"
#include "QF/locs.h"
#include "QF/msg.h" #include "QF/msg.h"
#include "QF/render.h" #include "QF/render.h"
#include "QF/skin.h" #include "QF/skin.h"
@ -1143,6 +1144,27 @@ CL_EmitEntities (void)
CL_LinkPacketEntities (); CL_LinkPacketEntities ();
CL_LinkProjectiles (); CL_LinkProjectiles ();
CL_UpdateTEnts (); CL_UpdateTEnts ();
if (!r_drawentities->int_val) {
dlight_t *dl;
location_t *nearloc;
vec3_t trueloc;
nearloc = locs_find (r_origin);
if (nearloc) {
dl = R_AllocDlight (4096);
if (dl) {
VectorCopy (nearloc->loc, dl->origin);
dl->radius = 200;
dl->die = r_realtime + 0.1;
dl->color[0] = 0;
dl->color[1] = 1;
dl->color[2] = 0;
}
VectorCopy (nearloc->loc, trueloc);
R_WizSpikeEffect (trueloc);
}
}
} }
void void

View file

@ -757,15 +757,17 @@ SV_ConSay (const char *prefix, client_t *client)
for (j = 0, client = svs.clients; j < MAX_CLIENTS; j++, client++) { for (j = 0, client = svs.clients; j < MAX_CLIENTS; j++, client++) {
if (client->state < cs_zombie) if (client->state < cs_zombie)
continue; continue;
SV_ClientPrintf (1, client, PRINT_HIGH, "%s\n", text->str); SV_ClientPrintf (0, client, PRINT_HIGH, "%s\n", text->str);
if (*prefix != 'I') // beep, except for Info says if (*prefix != 'I') // beep, except for Info says
SV_ClientPrintf (0, client, PRINT_CHAT, "%s", ""); SV_ClientPrintf (0, client, PRINT_CHAT, "%s", "");
} }
if (sv.demorecording) { if (sv.demorecording) {
DemoWrite_Begin (dem_all, 0, strlen (text->str) + 3); DemoWrite_Begin (dem_all, 0, strlen (text->str) + 3);
MSG_WriteByte (&demo.dbuf->sz, svc_print); MSG_WriteByte (&demo.dbuf->sz, svc_print);
MSG_WriteByte (&demo.dbuf->sz, PRINT_CHAT); MSG_WriteByte (&demo.dbuf->sz, PRINT_HIGH);
MSG_WriteString (&demo.dbuf->sz, text->str); MSG_WriteString (&demo.dbuf->sz, text->str);
MSG_WriteByte (&demo.dbuf->sz, PRINT_CHAT);
MSG_WriteString (&demo.dbuf->sz, "");
} }
} }
} }

View file

@ -97,9 +97,6 @@ SV_WriteDemoMessage (sizebuf_t *msg, int type, int to, float time)
byte c; byte c;
static double prevtime; static double prevtime;
if (!sv.demorecording)
return;
msec = (time - prevtime) * 1000; msec = (time - prevtime) * 1000;
prevtime += msec * 0.001; prevtime += msec * 0.001;
if (msec > 255) if (msec > 255)
@ -256,9 +253,6 @@ SV_DemoWritePackets (int num)
byte msg_buf[MAX_MSGLEN]; byte msg_buf[MAX_MSGLEN];
demoinfo_t *demoinfo; demoinfo_t *demoinfo;
if (!sv.demorecording)
return;
msg.data = msg_buf; msg.data = msg_buf;
msg.maxsize = sizeof (msg_buf); msg.maxsize = sizeof (msg_buf);
@ -382,10 +376,10 @@ SV_DemoWritePackets (int num)
} }
// this goes first to reduce demo size a bit // this goes first to reduce demo size a bit
SV_DemoWriteToDisk (demo.lasttype, demo.lastto, (float) time); SV_DemoWriteToDisk (demo.lasttype, demo.lastto, time);
SV_DemoWriteToDisk (0, 0, (float) time); // now goes the rest SV_DemoWriteToDisk (0, 0, time); // now goes the rest
if (msg.cursize) if (msg.cursize)
SV_WriteDemoMessage (&msg, dem_all, 0, (float) time); SV_WriteDemoMessage (&msg, dem_all, 0, time);
} }
if (demo.lastwritten > demo.parsecount) if (demo.lastwritten > demo.parsecount)
@ -704,8 +698,6 @@ SV_WriteSetDemoMessage (void)
int len; int len;
byte c; byte c;
// Con_Printf ("write: %ld bytes, %4.4f\n", msg->cursize, realtime);
c = 0; c = 0;
demo.size += DWRITE (&c, sizeof (c), demo.dest); demo.size += DWRITE (&c, sizeof (c), demo.dest);