Re-enable the location marker code.

Drawing is controlled via the cl_draw_locs command. Entities are still
drawn, but that might not be such a bad thing after all.
This commit is contained in:
Bill Currie 2012-07-06 10:39:28 +09:00
parent dbbd6f4535
commit a558f1b0f4
3 changed files with 7 additions and 4 deletions

View file

@ -312,6 +312,7 @@ extern struct cvar_s *cl_pitchspeed;
extern struct cvar_s *cl_anglespeedkey;
extern struct cvar_s *cl_draw_locs;
extern struct cvar_s *cl_shownet;
extern struct cvar_s *hud_sbar;
extern struct cvar_s *hud_sbar_separator;

View file

@ -592,14 +592,14 @@ CL_EmitEntities (void)
CL_LinkPlayers ();
CL_LinkPacketEntities ();
CL_UpdateTEnts ();
#if 0 //FIXME
if (!r_drawentities->int_val) {
if (cl_draw_locs->int_val) {
//FIXME custom ent rendering code would be nice
dlight_t *dl;
location_t *nearloc;
vec3_t trueloc;
int i;
nearloc = locs_find (r_origin);
nearloc = locs_find (cl.simorg);
if (nearloc) {
dl = r_funcs->R_AllocDlight (4096);
if (dl) {
@ -623,7 +623,6 @@ CL_EmitEntities (void)
104 + (rand () & 7), 1.0, 0.0);
}
}
#endif
}
void

View file

@ -138,6 +138,7 @@ cvar_t *cl_paranoid;
cvar_t *cl_timeout;
cvar_t *cl_draw_locs;
cvar_t *cl_shownet;
cvar_t *cl_autoexec;
cvar_t *cl_quakerc;
@ -1366,6 +1367,8 @@ CL_Init_Cvars (void)
"turning speed");
cl_writecfg = Cvar_Get ("cl_writecfg", "1", CVAR_NONE, NULL,
"write config files?");
cl_draw_locs = Cvar_Get ("cl_draw_locs", "0", CVAR_NONE, NULL,
"Draw location markers.");
cl_shownet = Cvar_Get ("cl_shownet", "0", CVAR_NONE, NULL,
"show network packets. 0=off, 1=basic, 2=verbose");
cl_maxfps = Cvar_Get ("cl_maxfps", "0", CVAR_ARCHIVE, NULL,