X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=src%2Ffreeglut_font.c;h=52a80c1d57fc764707de63bb6d96aadd8981a161;hb=a97d853592b0a77cbcf5525158a5e836ad10d924;hp=3be0a0d66924aa5a645b6ed51cd6f019b8945cd3;hpb=164f40e04e857b4edd4f58427cae44ceb85dbce0;p=freeglut

diff --git a/src/freeglut_font.c b/src/freeglut_font.c
index 3be0a0d..52a80c1 100644
--- a/src/freeglut_font.c
+++ b/src/freeglut_font.c
@@ -62,18 +62,21 @@ extern SFG_StrokeFont fgStrokeMonoRoman;
  */
 static SFG_Font* fghFontByID( void* font )
 {
-    /*
-     * XXX Use a macro, a table of some kind, or else split these
-     * XXX statements properly.  Jamming "return" on the end of an
-     * XXX "if" is just bad style, IMHO.
-     */
-    if( font == GLUT_BITMAP_8_BY_13        ) return &fgFontFixed8x13;
-    if( font == GLUT_BITMAP_9_BY_15        ) return &fgFontFixed9x15;
-    if( font == GLUT_BITMAP_HELVETICA_10   ) return &fgFontHelvetica10;
-    if( font == GLUT_BITMAP_HELVETICA_12   ) return &fgFontHelvetica12;
-    if( font == GLUT_BITMAP_HELVETICA_18   ) return &fgFontHelvetica18;
-    if( font == GLUT_BITMAP_TIMES_ROMAN_10 ) return &fgFontTimesRoman10;
-    if( font == GLUT_BITMAP_TIMES_ROMAN_24 ) return &fgFontTimesRoman24;
+    if( font == GLUT_BITMAP_8_BY_13        )
+        return &fgFontFixed8x13;
+    if( font == GLUT_BITMAP_9_BY_15        )
+        return &fgFontFixed9x15;
+    if( font == GLUT_BITMAP_HELVETICA_10   )
+        return &fgFontHelvetica10;
+    if( font == GLUT_BITMAP_HELVETICA_12   )
+        return &fgFontHelvetica12;
+    if( font == GLUT_BITMAP_HELVETICA_18   )
+        return &fgFontHelvetica18;
+    if( font == GLUT_BITMAP_TIMES_ROMAN_10 )
+        return &fgFontTimesRoman10;
+    if( font == GLUT_BITMAP_TIMES_ROMAN_24 )
+        return &fgFontTimesRoman24;
+
     fgError( "font 0x%08x not found", font );
     return 0; /*** NOT REACHED ***/
 }
@@ -84,12 +87,11 @@ static SFG_Font* fghFontByID( void* font )
  */
 static SFG_StrokeFont* fghStrokeByID( void* font )
 {
-    /*
-     * XXX Same comment as above about jamming "return" in after an
-     * XXX "if".
-     */
-    if( font == GLUT_STROKE_ROMAN      ) return &fgStrokeRoman;
-    if( font == GLUT_STROKE_MONO_ROMAN ) return &fgStrokeMonoRoman;
+    if( font == GLUT_STROKE_ROMAN      )
+        return &fgStrokeRoman;
+    if( font == GLUT_STROKE_MONO_ROMAN )
+        return &fgStrokeMonoRoman;
+
     fgError( "stroke font 0x%08x not found", font );
     return 0; /*** NOT REACHED ***/
 }
@@ -333,7 +335,7 @@ int FGAPIENTRY glutStrokeLength( void* fontID, const unsigned char* string )
         }
     if( length < this_line_length )
         length = this_line_length;
-    return ( int )( length + 0.5 );
+    return( int )( length + 0.5 );
 }
 
 /*
@@ -342,7 +344,7 @@ int FGAPIENTRY glutStrokeLength( void* fontID, const unsigned char* string )
 GLfloat FGAPIENTRY glutStrokeHeight( void* fontID )
 {
     SFG_StrokeFont* font = fghStrokeByID( fontID );
-    return( font->Height );
+    return font->Height;
 }
 
 /*** END OF FILE ***/