added support for GL_ARB_texture_env_combine, currently only used on wall rendering...

[xonotic/darkplaces.git] / sbar.c

diff --git a/sbar.c b/sbar.c
index fd63c1339165db8af43702d93845d50120f73591..73e51ca788f97bc38aabc63d90dff25820c0c88e 100644 (file)
--- a/sbar.c
+++ b/sbar.c
@@ -783,6 +783,9 @@ void Sbar_DrawFace (void)
                f = 4;
        else
                f = cl.stats[STAT_HEALTH] / 20;
+       // LordHavoc: I don't even know how the game didn't crash without this
+       if (f < 0)
+               f = 0;
 
        if (cl.time <= cl.faceanimtime)
        {
@@ -804,8 +807,6 @@ void Sbar_Draw (void)
        if (scr_con_current == vid.height)
                return;         // console is full screen
 
-       scr_copyeverything = 1;
-
 //     sb_updates++;
 
        if (sb_lines > 24)
@@ -960,9 +961,6 @@ void Sbar_DeathmatchOverlay (void)
        char                    num[128];
        scoreboard_t    *s;
 
-       scr_copyeverything = 1;
-       scr_fullupdate = 0;
-
        pic = Draw_CachePic ("gfx/ranking.lmp");
        M_DrawPic ((320-pic->width)/2, 8, pic);
 
@@ -1021,9 +1019,6 @@ void Sbar_MiniDeathmatchOverlay (void)
        if (vid.width < 512 || !sb_lines)
                return;
 
-       scr_copyeverything = 1;
-       scr_fullupdate = 0;
-
 // scores
        Sbar_SortFrags ();
 
@@ -1088,9 +1083,6 @@ void Sbar_IntermissionOverlay (void)
        int             dig;
        int             num;
 
-       scr_copyeverything = 1;
-       scr_fullupdate = 0;
-
        if (cl.gametype == GAME_DEATHMATCH)
        {
                Sbar_DeathmatchOverlay ();
@@ -1132,8 +1124,6 @@ void Sbar_FinaleOverlay (void)
 {
        qpic_t  *pic;
 
-       scr_copyeverything = 1;
-
        pic = Draw_CachePic ("gfx/finale.lmp");
        Draw_Pic ( (vid.width-pic->width)/2, 16, pic);
 }