more statics...

[xonotic/darkplaces.git] / ft2.c

diff --git a/ft2.c b/ft2.c
index 94aa88d7f117a6a73c60d535b4669592b7fd4f8c..ce929355b3ba5e8c282651be10e2abf8dd43e449 100644 (file)
--- a/ft2.c
+++ b/ft2.c
@@ -150,7 +150,7 @@ typedef struct
        unsigned char gausstable[2*POSTPROCESS_MAXRADIUS+1];
 }
 font_postprocess_t;
-static font_postprocess_t pp = {0};
+static font_postprocess_t pp;
 
 /*
 ====================
@@ -312,11 +312,13 @@ qboolean Font_Attach(ft2_font_t *font, ft2_attachment_t *attachment)
 
 float Font_VirtualToRealSize(float sz)
 {
-       int vh, vw, si;
+       int vh;
+       //int vw;
+       int si;
        float sn;
        if(sz < 0)
                return sz;
-       vw = ((vid.width > 0) ? vid.width : vid_width.value);
+       //vw = ((vid.width > 0) ? vid.width : vid_width.value);
        vh = ((vid.height > 0) ? vid.height : vid_height.value);
        // now try to scale to our actual size:
        sn = sz * vh / vid_conheight.value;
@@ -529,13 +531,10 @@ static qboolean Font_LoadFile(const char *name, int _face, ft2_settings_t *setti
 
 void Font_Postprocess_Update(ft2_font_t *fnt, int bpp, int w, int h)
 {
-       qboolean need_gauss = false, need_circle = false;
        int needed, x, y;
        float gausstable[2*POSTPROCESS_MAXRADIUS+1];
-       if(!pp.buf || pp.blur != fnt->settings->blur || pp.shadowz != fnt->settings->shadowz)
-               need_gauss = true;
-       if(!pp.buf || pp.outline != fnt->settings->outline || pp.shadowx != fnt->settings->shadowx || pp.shadowy != fnt->settings->shadowy)
-               need_circle = true;
+       qboolean need_gauss  = (!pp.buf || pp.blur != fnt->settings->blur || pp.shadowz != fnt->settings->shadowz);
+       qboolean need_circle = (!pp.buf || pp.outline != fnt->settings->outline || pp.shadowx != fnt->settings->shadowx || pp.shadowy != fnt->settings->shadowy);
        pp.blur = fnt->settings->blur;
        pp.outline = fnt->settings->outline;
        pp.shadowx = fnt->settings->shadowx;