X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=freeglut-1.3%2Ffreeglut_font.c;h=64a9278544cdd973de54e8484c70f9236f3f1d26;hb=a86a957ae87e1b07260edec971ebdf5a98ff3d54;hp=26f7d6303cf356562481984b881a4e7496c59ae5;hpb=0299b8ec2aafba355ef04cec2d1445e5ce8079d8;p=freeglut

diff --git a/freeglut-1.3/freeglut_font.c b/freeglut-1.3/freeglut_font.c
index 26f7d63..64a9278 100644
--- a/freeglut-1.3/freeglut_font.c
+++ b/freeglut-1.3/freeglut_font.c
@@ -92,7 +92,9 @@ static SFG_Font* fghFontByID( void* font )
     /*
      * This probably is the library user's fault
      */
-    g_error( "font 0x%08x not found", font );
+    fgError( "font 0x%08x not found", font );
+
+    return 0;
 }
 
 
@@ -103,7 +105,7 @@ static SFG_Font* fghFontByID( void* font )
  */
 void FGAPIENTRY glutBitmapCharacter( void* fontID, int character )
 {
-    const guchar* face;
+    const GLubyte* face;
 
     /*
      * First of all we'll need a font to use
@@ -151,6 +153,14 @@ void FGAPIENTRY glutBitmapCharacter( void* fontID, int character )
     glPopClientAttrib();
 }
 
+void FGAPIENTRY glutBitmapString( void* fontID, const char *string )
+{
+    int i;
+
+    for( i=0; i<strlen( string ); i++ )
+        glutBitmapCharacter( fontID, string[ i ] );
+}
+
 /*
  * Returns the width in pixels of a font's character
  */
@@ -199,12 +209,12 @@ int FGAPIENTRY glutStrokeWidth( void* fontID, int character )
  */
 int FGAPIENTRY glutBitmapLength( void* fontID, const char* string )
 {
-    gint i, length = 0;
+    int i, length = 0;
 
     /*
      * Using glutBitmapWidth() function to calculate the result
      */
-    for( i=0; i<(gint) strlen( string ); i++ )
+    for( i=0; i<strlen( string ); i++ )
         length += glutBitmapWidth( fontID, string[ i ] );
 
     /*
@@ -218,12 +228,12 @@ int FGAPIENTRY glutBitmapLength( void* fontID, const char* string )
  */
 int FGAPIENTRY glutStrokeLength( void* fontID, const char* string )
 {
-    gint i, length = 0;
+    int i, length = 0;
 
     /*
      * Using glutStrokeWidth() function to calculate the result
      */
-    for( i=0; i<(gint) strlen( string ); i++ )
+    for( i=0; i<strlen( string ); i++ )
         length += glutStrokeWidth( fontID, string[ i ] );
 
     /*