]> git.rm.cloudns.org Git - xonotic/darkplaces.git/commitdiff
fix the bug I just fixed another time :P slight speedup, no other change from this
authordivverent <divverent@d7cf8633-e32d-0410-b094-e92efae38249>
Wed, 20 Jan 2010 09:39:52 +0000 (09:39 +0000)
committerRudolf Polzer <rpolzer@grawp.div0.qc.to>
Sun, 24 Jan 2010 18:09:38 +0000 (19:09 +0100)
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@9841 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::merge=16d1bc98646ef5ac05806f7190b3424b70804c32

gl_draw.c

index ec53f912d0313ce8464659fab83146d9c746f989..ff8176f245772e3d704832da5b67aad808c830a4 100644 (file)
--- a/gl_draw.c
+++ b/gl_draw.c
@@ -1241,7 +1241,6 @@ float DrawQ_TextWidth_UntilWidth_TrackColors_Scale(const char *text, size_t *max
                        }
                        x += width_of[ch] * dw;
                } else {
-                       //if (!map || map == ft2_oldstyle_map || map->start < ch || map->start + FONT_CHARS_PER_MAP >= ch)
                        if (!map || map == ft2_oldstyle_map || ch < map->start || ch >= map->start + FONT_CHARS_PER_MAP)
                        {
                                map = FontMap_FindForChar(fontmap, ch);
@@ -1517,7 +1516,7 @@ float DrawQ_String_Scale(float startx, float starty, const char *text, size_t ma
                                }
                                x += width_of[ch] * dw;
                        } else {
-                               if (!map || map == ft2_oldstyle_map || map->start < ch || map->start + FONT_CHARS_PER_MAP >= ch)
+                               if (!map || map == ft2_oldstyle_map || ch < map->start || ch >= map->start + FONT_CHARS_PER_MAP)
                                {
                                        // new charmap - need to render
                                        if (batchcount)