todo item done: fixed con_notify cvar (limits number of displayed notify lines)

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@3701 d7cf8633-e32d-0410-b094-e92efae38249

diff --git a/console.c b/console.c
index f3d1ebc735dd292ffe3c2e33ffc8bc0180afb507..a9661cff147a5c8e7f81997079ab47ffa59b596f 100644 (file)
--- a/console.c
+++ b/console.c
@@ -73,9 +73,6 @@ qboolean con_initialized;
 
 mempool_t *console_mempool;
 
-// scan lines to clear for notify lines
-int con_notifylines;
-
 extern void M_Menu_Main_f (void);
 
 /*
@@ -322,7 +319,7 @@ void Con_Print (const char *txt)
                        {
                                if (con_notify.integer < 0)
                                        Cvar_SetValueQuick(&con_notify, 0);
-                               if (con_notifylines > MAX_NOTIFYLINES)
+                               if (con_notify.integer > MAX_NOTIFYLINES)
                                        Cvar_SetValueQuick(&con_notify, MAX_NOTIFYLINES);
                                if (con_notify.integer > 0)
                                        con_times[con_current % con_notify.integer] = realtime;
@@ -518,7 +515,7 @@ void Con_DrawNotify (void)
 
        if (con_notify.integer < 0)
                Cvar_SetValueQuick(&con_notify, 0);
-       if (con_notifylines > MAX_NOTIFYLINES)
+       if (con_notify.integer > MAX_NOTIFYLINES)
                Cvar_SetValueQuick(&con_notify, MAX_NOTIFYLINES);
        v = 0;
        for (i= con_current-con_notify.integer+1 ; i<=con_current ; i++)
@@ -564,9 +561,6 @@ void Con_DrawNotify (void)
                        v += 8;
                }
        }
-
-       if (con_notifylines < v)
-               con_notifylines = v;
 }
 
 /*

diff --git a/console.h b/console.h
index d6aec97ce54bfc3ad930d2f2fcd3764155108935..780082b019239bcc2f2d0ece0c9540e3035518df 100644 (file)
--- a/console.h
+++ b/console.h
@@ -28,7 +28,6 @@ extern int con_totallines;
 extern int con_backscroll;
 extern qboolean con_initialized;
 extern qbyte *con_chars;
-extern int con_notifylines;            // scan lines to clear for notify lines
 
 void Con_CheckResize (void);
 void Con_InitLogging (void);

diff --git a/todo b/todo
index d1b0d40aa7735aea971da486b20d3e557097471d..f1d9201a800e5089b45244ffe490741d64f5bc67 100644 (file)
--- a/todo
+++ b/todo
@@ -67,7 +67,7 @@ d darkplaces: add DP_LITSUPPORT extension and document it
 0 darkplaces: add vid_vsync cvar and also to options menu (metlslime)
 0 darkplaces: alias layers should have a shadow volume pass so that nodraw textures don't cast a shadow (Electro)
 0 darkplaces: can't move when stuck in a monster (SeienAbunae)
-0 darkplaces: change particle() macro in cl_particles.c to have a do{}while(0) to eat the ;
+f darkplaces: change particle() macro in cl_particles.c to have a do{}while(0) to eat the ;
 0 darkplaces: check for out of bounds lump data ranges in maps (FrikaC)
 0 darkplaces: check for truncated sound files (FrikaC)
 0 darkplaces: cl_particles_maximum cvar (default 32768) which would change number of particles allowed at once (TheBeast)
@@ -80,7 +80,7 @@ d darkplaces: add DP_LITSUPPORT extension and document it
 0 darkplaces: embed a fallback conchars.tga so it can load in an empty directory with a visible console (right now it uses the checkerboard texture)
 0 darkplaces: figure out what's wrong with gloss rendering vertex calculations, which may be GF2 related (QorpsE)
 0 darkplaces: figure out why monsters keep making fall pain sound after they've landed in dpmod (Cruaich)
-0 darkplaces: fix con_notify (should control number of lines)
+d darkplaces: fix con_notify (should control number of lines)
 0 darkplaces: fix disappearing viewmodel (and other models) when in an unvised q3bsp, or partially inside a wall in q3bsp
 0 darkplaces: fix key based turning being affected by slowmo - it should not be
 0 darkplaces: fix r_drawentities view problem (stops updating r_refdef.vieworg?) (Vic)