Started font support

include/Window.h

@@ -14,6 +14,7 @@ typedef struct {
     char *text;
     unsigned int x;
     unsigned int y;
+    float scale;
 } WindowString;
 
 /*!
@@ -39,13 +40,17 @@ public:
 
     virtual void eventHandling() = 0;
 
-    virtual void writeString(WindowString *s) = 0;
-
     virtual void delay(clock_t ms) = 0;
 
     virtual void swapBuffersGL() = 0;
 
     virtual void resizeGL(unsigned int w, unsigned int h);
+
+    virtual void setFont(const char *font) = 0;
+
+    virtual int initializeFont() = 0;
+
+    virtual void writeString(WindowString *s) = 0;
 };
 
 #endif

include/WindowSDL.h

@@ -40,12 +40,16 @@ public:
 
     virtual void eventHandling();
 
-    virtual void writeString(WindowString *s);
-
     virtual void delay(clock_t ms);
 
     virtual void swapBuffersGL();
 
+    virtual void setFont(const char *font);
+
+    virtual int initializeFont();
+
+    virtual void writeString(WindowString *s);
+
 private:
     bool mInit;
     char *mDriver;
@@ -53,6 +57,8 @@ private:
     unsigned int mHeight;
     bool mFullscreen;
     bool mMousegrab;
+    char *mFont;
+    bool mFontInit;
 
     SDL_Window *mWindow;      //!< This is the pointer to the SDL surface
     SDL_GLContext mGLContext; //!< The OpenGL Context

src/OpenRaider.cpp

@@ -42,10 +42,15 @@ int OpenRaider::initialize() {
     assert(mInit == false);
     assert(mRunning == false);
 
+    // Initialize Windowing
     mWindow = new WindowSDL();
     if (mWindow->initialize() != 0)
         return -1;
 
+    // Initialize windows font
+    if (mWindow->initializeFont() != 0)
+        return -2;
+
     mInit = true;
 
     return 0;

src/WindowSDL.cpp

@@ -21,18 +21,26 @@ WindowSDL::WindowSDL() {
     mHeight = DEFAULT_HEIGHT;
     mFullscreen = false;
     mMousegrab = false;
+    mFont = NULL;
+    mFontInit = false;
     mWindow = NULL;
     mGLContext = NULL;
+
+#ifdef WIN32
+    setDriver("libGL32.dll");
+#elif !defined(__APPLE__)
+    setDriver("/usr/lib/libGL.so.1");
+#endif
 }
 
 WindowSDL::~WindowSDL() {
-    if (mDriver)
-        delete [] mDriver;
-
     if (mInit) {
         SDL_QuitSubSystem(SUBSYSTEMS_USED);
         SDL_Quit();
     }
+
+    if (mDriver)
+        delete [] mDriver;
 }
 
 void WindowSDL::setDriver(const char *driver) {
@@ -174,14 +182,6 @@ void WindowSDL::eventHandling() {
     }
 }
 
-void WindowSDL::writeString(WindowString *s) {
-    assert(s != NULL);
-    assert(s->text != NULL);
-    assert(mInit == true);
-
-
-}
-
 void WindowSDL::delay(clock_t ms) {
     assert(mInit == true);
 
@@ -194,3 +194,28 @@ void WindowSDL::swapBuffersGL() {
     SDL_GL_SwapWindow(mWindow);
 }
 
+void WindowSDL::setFont(const char *font) {
+    assert(font != NULL);
+    assert(font[0] != '\0');
+    assert(mFontInit == false);
+
+    mFont = fullPath(font, 0);
+}
+
+int WindowSDL::initializeFont() {
+    assert(mFontInit == false);
+    assert(mFont != NULL);
+    assert(mFont[0] != '\0');
+
+    mFontInit = true;
+    return 0;
+}
+
+void WindowSDL::writeString(WindowString *s) {
+    assert(s != NULL);
+    assert(s->text != NULL);
+    assert(mInit == true);
+
+
+}
+