From f0981aa6b09e67ec57b7cb92421513415292e97f Mon Sep 17 00:00:00 2001
From: pixel <pixel>
Date: Tue, 17 Dec 2002 00:09:50 +0000
Subject: Commit of the day...

---
 include/glbase.h    |  2 +-
 include/glfont.h    | 10 ++++++++--
 include/gltexture.h |  1 +
 3 files changed, 10 insertions(+), 3 deletions(-)

(limited to 'include')

diff --git a/include/glbase.h b/include/glbase.h
index 39c7493..27c4f75 100644
--- a/include/glbase.h
+++ b/include/glbase.h
@@ -16,7 +16,7 @@ namespace mogltk {
 	static void Leave2DMode(void);
 	static void Flip(void);
 	static bool is2D(void);
-	static void glVertex(GLshort, GLshort, GLshort = 0, GLshort = 1);
+        static void glVertex(GLshort, GLshort, GLshort = 0, GLshort = 1);
 	static void glVertex(GLint, GLint, GLint = 0, GLint = 1);
 	static void glVertex(GLfloat, GLfloat, GLfloat = 0.0, GLfloat = 1.0);
 	static void glVertex(GLdouble, GLdouble, GLdouble = 0.0, GLdouble = 1.0);
diff --git a/include/glfont.h b/include/glfont.h
index de4ef63..cbff848 100644
--- a/include/glfont.h
+++ b/include/glfont.h
@@ -4,14 +4,18 @@
 #include <SDL.h>
 #include <String.h>
 #include <Color.h>
+#include <Handle.h>
 #include "gltexture.h"
 
 namespace mogltk {
     class font : public Base {
       public:
-          font(const String & = "font.bin");
+          font(Handle *);
 	  virtual ~font();
-	void drawentry(Uint16, Color = Color(255, 255, 255), int = -1, int = -1);
+	void drawentry(Uint16, int, int, Color = Color(255, 255, 255, 255));
+	void putcursor(int, int);
+	void putentry(Uint16, Color = Color(255, 255, 255, 255));
+	void newline(void);
 	
       private:
         Uint8 * sizes;
@@ -19,6 +23,8 @@ namespace mogltk {
 	Uint8 flags, maxX, maxY, nbcU, nbcV;
 	texture ** fonttex;
 	Uint16 * corresp;
+	void Bind(int);
+	int cx, cy, ox;
     };
 };
 
diff --git a/include/gltexture.h b/include/gltexture.h
index 1e4c3d2..9cbfe54 100644
--- a/include/gltexture.h
+++ b/include/gltexture.h
@@ -27,6 +27,7 @@ namespace mogltk {
 	static texture * footer;
 	texture * next, * prev;
 #endif
+	static texture * active;
     };
 };
 
-- 
cgit v1.2.3