Showing with 4 additions and 3 deletions.
  1. +2 −0 src/video/font.cpp
  2. +1 −0 src/video/font.hpp
  3. +1 −1 src/video/surface.cpp
  4. +0 −2 src/video/surface.hpp
@@ -70,6 +70,7 @@ Font::Font(GlyphWidth glyph_width_,
rtl(false),
glyphs(65536),
file_name(filename),
fontsize(),
ttf_font()
{
for(unsigned int i=0; i<65536;i++) glyphs[i].surface_idx = -1;
@@ -100,6 +101,7 @@ Font::Font(const std::string& filename,
rtl(false),
glyphs(65536),
file_name(filename),
fontsize(font_size),
ttf_font()
{
ttf_font = TTF_OpenFont(filename.c_str(), font_size);
@@ -150,6 +150,7 @@ class Font
std::vector<Glyph> glyphs;

const std::string file_name;
int fontsize;
TTF_Font* ttf_font;
};

@@ -19,6 +19,7 @@
#include <config.h>

#include <SDL.h>
#include <SDL_ttf.h>

#include "video/texture.hpp"
#include "video/video_system.hpp"
@@ -63,7 +64,6 @@ Surface::Surface(TexturePtr texture) :
surface_data = VideoSystem::current()->new_surface_data(*this);
}


Surface::Surface(const std::string& file, const Rect& rect_) :
texture(TextureManager::current()->get(file, rect_)),
surface_data(),
@@ -17,8 +17,6 @@
#ifndef HEADER_SUPERTUX_VIDEO_SURFACE_HPP
#define HEADER_SUPERTUX_VIDEO_SURFACE_HPP

#include <SDL_ttf.h>

#include <string>
#include <memory>