include fixes from ohnobinki, video_systems.cpp should fall back to SDL now if GL...

[supertux.git] / src / video / font.cpp

diff --git a/src/video/font.cpp b/src/video/font.cpp
index 86e524d..d9ccd08 100644 (file)
--- a/src/video/font.cpp
+++ b/src/video/font.cpp
@@ -17,6 +17,7 @@
 
 #include <config.h>
 
+#include <sstream>
 #include <stdlib.h>
 #include <string.h>
 #include <stdexcept>
@@ -163,15 +164,15 @@ Font::loadFontSurface(
   int char_width
   )
 {
-  Surface glyph_surface("images/engine/fonts/" + glyphimage);
-  Surface shadow_surface("images/engine/fonts/" + shadowimage);
+  SurfacePtr glyph_surface  = Surface::create("images/engine/fonts/" + glyphimage);
+  SurfacePtr shadow_surface = Surface::create("images/engine/fonts/" + shadowimage);
 
   int surface_idx = glyph_surfaces.size();
   glyph_surfaces.push_back(glyph_surface);
   shadow_surfaces.push_back(shadow_surface);
 
   int row=0, col=0;
-  int wrap = glyph_surface.get_width() / char_width;
+  int wrap = glyph_surface->get_width() / char_width;
  
   SDL_Surface *surface = NULL;
   
@@ -197,12 +198,14 @@ Font::loadFontSurface(
       Glyph glyph;
       glyph.surface_idx   = surface_idx;
       
-      if( glyph_width == FIXED ) {
-        glyph.rect    = Rect(x, y, x + char_width, y + char_height);
+      if( glyph_width == FIXED ) 
+      {
+        glyph.rect    = Rectf(x, y, x + char_width, y + char_height);
         glyph.offset  = Vector(0, 0);
         glyph.advance = char_width;
       }
-      else {
+      else 
+      {
         int left = x;
         while (left < x + char_width && vline_empty(surface, left, y, y + char_height, 64))
           left += 1;
@@ -210,13 +213,18 @@ Font::loadFontSurface(
         while (right > left && vline_empty(surface, right, y, y + char_height, 64))
           right -= 1;
           
-        if (left <= right)
-          glyph.rect = Rect(left,  y, right+1, y + char_height);
-        else // glyph is completely transparent
-          glyph.rect = Rect(x,  y, x + char_width, y + char_height);
-        
-        glyph.offset  = Vector(0, 0);
-        glyph.advance = glyph.rect.get_width() + 1; // FIXME: might be useful to make spacing configurable
+        if (left <= right) 
+        {
+          glyph.offset  = Vector(x-left, 0);
+          glyph.advance = right - left + 1 + 1; // FIXME: might be useful to make spacing configurable
+        } 
+        else 
+        { // glyph is completly transparent
+          glyph.offset  = Vector(0, 0);
+          glyph.advance = char_width + 1; // FIXME: might be useful to make spacing configurable
+        }
+
+        glyph.rect = Rectf(x,  y, x + char_width, y + char_height);
       }
 
       glyphs[*chr] = glyph;
@@ -417,7 +425,7 @@ Font::draw_chars(Renderer *renderer, bool notshadow, const std::string& text,
       SurfacePartRequest surfacepartrequest;
       surfacepartrequest.size = glyph.rect.p2 - glyph.rect.p1;
       surfacepartrequest.source = glyph.rect.p1;
-      surfacepartrequest.surface = notshadow ? &(glyph_surfaces[glyph.surface_idx]) : &(shadow_surfaces[glyph.surface_idx]);
+      surfacepartrequest.surface = notshadow ? glyph_surfaces[glyph.surface_idx].get() : shadow_surfaces[glyph.surface_idx].get();
 
       request.request_data = &surfacepartrequest;
       renderer->draw_surface_part(request);