More use of SurfacePtr

SVN-Revision: 6207

diff --git a/src/video/font.cpp b/src/video/font.cpp
index b7562fa..429b0a1 100644 (file)
--- a/src/video/font.cpp
+++ b/src/video/font.cpp
@@ -163,15 +163,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;
   
@@ -424,7 +424,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);

diff --git a/src/video/font.hpp b/src/video/font.hpp
index ffd89b8..4704d76 100644 (file)
--- a/src/video/font.hpp
+++ b/src/video/font.hpp
@@ -133,8 +133,8 @@ private:
 private:
   GlyphWidth glyph_width;
 
-  std::vector<Surface>  glyph_surfaces;
-  std::vector<Surface>  shadow_surfaces;
+  std::vector<SurfacePtr>  glyph_surfaces;
+  std::vector<SurfacePtr>  shadow_surfaces;
   int char_height;
   int shadowsize;