--- a/GUIFont.cpp	Wed Feb 06 22:51:11 2013 +0000
+++ b/GUIFont.cpp	Wed Feb 06 23:16:45 2013 +0000
@@ -479,39 +479,45 @@
   uXa = v9;
   if ( (signed int)v9 > 0 )
   {
-    while ( !IsCharValid(*v8) )
+    while ( v10 < (signed int)uXa )
     {
-LABEL_11:
+	  if(IsCharValid(*v8))
+	  {
+		v12=(unsigned int)v8;
+		if ( v12 != 9 )
+		{
+		  if ( v12 == 10 )
+		  {
+			v6 = v6 + *(char *)(v11 + 5) - 3;
+			if ( v6 >= (signed int)(a5 * pWindow->uFrameHeight) )
+			  return (int)(v8 + 1);
+			if ( v6 >= (signed int)(a5 * pWindow->uFrameHeight) )
+			  return (int)v8;
+		  }
+		  else if ( v12 == 12 )
+		  {
+			v8 += 5;
+			v10 += 5;
+			if ( v6 >= (signed int)(a5 * pWindow->uFrameHeight) )
+			  return (int)v8;
+		  }
+		  else if ( v12 != 13 )
+		  {
+			if ( v6 >= (signed int)(a5 * pWindow->uFrameHeight) )
+			  return (int)v8; 
+		  }
+		}
+		if(v12 == 13 || v12 == 9)
+		{
+			v8 += 3;
+			v10 += 3;
+		}
+		if ( v6 >= (signed int)(a5 * pWindow->uFrameHeight) )
+		  return (int)v8;
+	  }
       ++v10;
       ++v8;
-      if ( v10 >= (signed int)uXa )
-        return (int)v8;
     }
-	v12=(unsigned int)v8;
-    if ( v12 != 9 )
-    {
-      if ( v12 == 10 )
-      {
-        v6 = v6 + *(char *)(v11 + 5) - 3;
-        if ( v6 >= (signed int)(a5 * pWindow->uFrameHeight) )
-          return (int)(v8 + 1);
-        goto LABEL_10;
-      }
-      if ( v12 == 12 )
-      {
-        v8 += 5;
-        v10 += 5;
-LABEL_10:
-        if ( v6 >= (signed int)(a5 * pWindow->uFrameHeight) )
-          return (int)v8;
-        goto LABEL_11;
-      }
-      if ( v12 != 13 )
-        goto LABEL_10;
-    }
-    v8 += 3;
-    v10 += 3;
-    goto LABEL_10;
   }
   return (int)v8;
 }