diff options
| author | Vicent Marti | 2008-07-10 16:37:45 +0000 |
|---|---|---|
| committer | Vicent Marti | 2008-07-10 16:37:45 +0000 |
| commit | e0aad7f4be66a9e30f0226c17c9d2bd0a8138898 (patch) | |
| tree | 63d710ef171255c518f8c6321e31a3062720e7c4 /graphics | |
| parent | ccf9368c533110a5c72df3607466a16651ec6497 (diff) | |
| download | scummvm-rg350-e0aad7f4be66a9e30f0226c17c9d2bd0a8138898.tar.gz scummvm-rg350-e0aad7f4be66a9e30f0226c17c9d2bd0a8138898.tar.bz2 scummvm-rg350-e0aad7f4be66a9e30f0226c17c9d2bd0a8138898.zip | |
Bugfix: Delayed loading of fonts
svn-id: r32993
Diffstat (limited to 'graphics')
| -rw-r--r-- | graphics/VectorRenderer.cpp | 3 | ||||
| -rw-r--r-- | graphics/VectorRenderer.h | 6 |
2 files changed, 4 insertions, 5 deletions
diff --git a/graphics/VectorRenderer.cpp b/graphics/VectorRenderer.cpp index daeeb43f69..0c1d01213d 100644 --- a/graphics/VectorRenderer.cpp +++ b/graphics/VectorRenderer.cpp @@ -75,7 +75,6 @@ void VectorRenderer::textStep(const Common::String &text, const Common::Rect &ar if (step.color.set) setFgColor(step.color.r, step.color.g, step.color.b); - assert(step.font); drawString(step.font, text.c_str(), area, step.align); } @@ -186,7 +185,7 @@ inline uint32 fp_sqroot(uint32 x) { ********************************************************************/ template <typename PixelType, typename PixelFormat> void VectorRendererSpec<PixelType, PixelFormat>:: -drawString(Graphics::Font *font, const Common::String &text, const Common::Rect &area, GUI::Theme::TextAlign align) { +drawString(const Graphics::Font *font, const Common::String &text, const Common::Rect &area, GUI::Theme::TextAlign align) { font->drawString(_activeSurface, text, area.left, area.top, area.width(), _fgColor, (Graphics::TextAlignment)align, 0, false); } diff --git a/graphics/VectorRenderer.h b/graphics/VectorRenderer.h index 402c76a55c..9b5481cddf 100644 --- a/graphics/VectorRenderer.h +++ b/graphics/VectorRenderer.h @@ -48,7 +48,7 @@ struct TextStep { GUI::Theme::TextAlign align; char *text; - Graphics::Font *font; + const Graphics::Font *font; }; struct DrawStep { @@ -446,7 +446,7 @@ public: */ virtual void blitSurface(Graphics::Surface *source, const Common::Rect &r) = 0; - virtual void drawString(Graphics::Font *font, const Common::String &text, const Common::Rect &area, GUI::Theme::TextAlign align) = 0; + virtual void drawString(const Graphics::Font *font, const Common::String &text, const Common::Rect &area, GUI::Theme::TextAlign align) = 0; protected: Surface *_activeSurface; /** Pointer to the surface currently being drawn */ @@ -513,7 +513,7 @@ public: drawBevelSquareAlg(x, y, w, h, bevel, _fgColor, _bgColor); } - void drawString(Graphics::Font *font, const Common::String &text, const Common::Rect &area, GUI::Theme::TextAlign align); + void drawString(const Graphics::Font *font, const Common::String &text, const Common::Rect &area, GUI::Theme::TextAlign align); /** * @see VectorRenderer::setFgColor() |