[quake3-commits] r2227 - trunk/code/renderer

[DONOTREPLY at icculus.org]

Author: ztm
Date: 2012-03-29 01:15:46 -0400 (Thu, 29 Mar 2012)
New Revision: 2227

Modified:
   trunk/code/renderer/tr_font.c
Log:
Fixed possibly placing a font glyph (at the beginning of a row) past the bottom of a font cache image.

Modified: trunk/code/renderer/tr_font.c
===================================================================
--- trunk/code/renderer/tr_font.c	2012-03-29 04:49:36 UTC (rev 2226)
+++ trunk/code/renderer/tr_font.c	2012-03-29 05:15:46 UTC (rev 2227)
@@ -233,17 +233,11 @@
 
     // we need to make sure we fit
     if (*xOut + scaled_width + 1 >= 255) {
-      if (*yOut + *maxHeight + 1 >= 255) {
-        *yOut = -1;
-        *xOut = -1;
-        ri.Free(bitmap->buffer);
-        ri.Free(bitmap);
-        return &glyph;
-      } else {
-        *xOut = 0;
-        *yOut += *maxHeight + 1;
-      }
-    } else if (*yOut + *maxHeight + 1 >= 255) {
+      *xOut = 0;
+      *yOut += *maxHeight + 1;
+    }
+
+    if (*yOut + *maxHeight + 1 >= 255) {
       *yOut = -1;
       *xOut = -1;
       ri.Free(bitmap->buffer);