fix the obvious bugs

diff --git a/lib/glcomp/Makefile.am b/lib/glcomp/Makefile.am
index 91cd8f6925a2d4695bd58a7393a6e2c567462858..5574d5094aa7c0ea82ca4fad232403e061a9f063 100644 (file)
--- a/lib/glcomp/Makefile.am
+++ b/lib/glcomp/Makefile.am
@@ -6,10 +6,10 @@ AM_CPPFLAGS = \
        $(GTK_CFLAGS) $(GTKGL_CFLAGS) $(GTKGLEXT_CFLAGS) $(GLADE_CFLAGS) $(FREETYPE2_CFLAGS)
 
 if WITH_SMYRNA
-noinst_HEADERS = glcompset.h glcomptexture.h glutils.h \
-       glTexFont.h glTexFontDefs.h glTexFontInclude.h glTexFontTGA.h
+noinst_HEADERS = glcompset.h glcomptexture.h glutils.h glTexFont.h \
+                glTexFontDefs.h glTexFontInclude.h glTexFontTGA.h glpangofont.h
 noinst_LTLIBRARIES = libglcomp_C.la
 endif
 
 libglcomp_C_la_SOURCES = glcompset.c glcomptexture.c glutils.c \
-       glTexFont.c glTexFontColor.c glTexFontTGA.c
+       glTexFont.c glTexFontColor.c glTexFontTGA.c glpangofont.c

diff --git a/lib/glcomp/glTexFontColor.c b/lib/glcomp/glTexFontColor.c
index 8a3a66540ce757bf327c290323bf282ae11e0ec7..10c273953a48a37b63b12fec9adf90e0b42dd114 100755 (executable)
--- a/lib/glcomp/glTexFontColor.c
+++ b/lib/glcomp/glTexFontColor.c
@@ -12,7 +12,7 @@
     Contact     -- vandals1@home.com
     Web         -- http://members.home.com/vandals1
 */
-#include "glTexfont.h"
+#include "glTexFont.h"
 
 /* color functions must be defined in texfont->h */
 

diff --git a/lib/glcomp/glTexFontDefs.h b/lib/glcomp/glTexFontDefs.h
index 8e56b14b37cfac20980d6cd75d7a7dd54a06dac9..2db027fad56fbe6a5d1cec631fd99d28098cbe46 100755 (executable)
--- a/lib/glcomp/glTexFontDefs.h
+++ b/lib/glcomp/glTexFontDefs.h
@@ -34,7 +34,7 @@
 #define fontColorCopy(a,b)          {b[0]= a[0]; b[1]= a[1]; b[2]= a[2]; b[3]= a[3];} /* copys colors */
 
 /* various functions used by the library, see texFont.c for info */
-void fontDrawChar (texFont_t* font,char c, int x, int y, int size, int shadow);
+void fontDrawChar (texFont_t* font,char c, GLfloat x, GLfloat y, GLfloat size, int shadow);
 void fontScissorNormal (texFont_t* font,int xpos, int ypos, int tabs, int carrage, int size, int len);
 int fontSetColorFromToken (texFont_t* font,char *s);
 int fontGetCharHits (char *s, char f);
@@ -44,4 +44,4 @@ void fontReset (texFont_t* font);
 void fontScissorTextRegion (texFont_t* font);
 int fontItalicsMode (texFont_t* font,char *s);
 int fontBoldMode (texFont_t* font,char *s);
-void fontRenderChar (texFont_t* font,char c, int x, int y, int size);
+void fontRenderChar (texFont_t* font,char c, GLfloat x, GLfloat y, GLfloat size);