diff options
| author | Max Horn | 2005-01-06 21:15:52 +0000 |
|---|---|---|
| committer | Max Horn | 2005-01-06 21:15:52 +0000 |
| commit | c6e0d31e76134fbdd3a1626aad9ed3e38f25afb3 (patch) | |
| tree | 913925590e558d57670e21479d4853e6bb15447c /sound | |
| parent | f3b7c27cbdeb7f1801fa5ed34d2aa0b65454b72f (diff) | |
| download | scummvm-rg350-c6e0d31e76134fbdd3a1626aad9ed3e38f25afb3.tar.gz scummvm-rg350-c6e0d31e76134fbdd3a1626aad9ed3e38f25afb3.tar.bz2 scummvm-rg350-c6e0d31e76134fbdd3a1626aad9ed3e38f25afb3.zip | |
Added a font manager (work in progress)
svn-id: r16460
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/softsynth/mt32.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/sound/softsynth/mt32.cpp b/sound/softsynth/mt32.cpp index 52668c9bc3..358cfacc84 100644 --- a/sound/softsynth/mt32.cpp +++ b/sound/softsynth/mt32.cpp @@ -32,7 +32,7 @@ #include "common/file.h" #include "common/config-manager.h" -#include "graphics/font.h" +#include "graphics/fontman.h" #include "graphics/surface.h" class MidiChannel_MT32 : public MidiChannel_MPU401 { @@ -124,11 +124,12 @@ static int eatSystemEvents() { } static void drawProgress(float progress) { + const Graphics::Font &font(*FontMan.getFontByUsage(Graphics::FontManager::kOSDFont)); Graphics::Surface surf; uint32 borderColor = 0x2; uint32 fillColor = 0x4; surf.w = g_system->getWidth() / 7 * 5; - surf.h = Graphics::g_scummfont.getFontHeight(); + surf.h = font.getFontHeight(); int x = g_system->getWidth() / 7; int y = g_system->getHeight() / 2 - surf.h / 2; surf.pitch = surf.w; @@ -145,7 +146,7 @@ static void drawProgress(float progress) { } static void drawMessage(int offset, const Common::String &text) { - const Graphics::Font &font(Graphics::g_scummfont); + const Graphics::Font &font(*FontMan.getFontByUsage(Graphics::FontManager::kOSDFont)); Graphics::Surface surf; uint32 color = 0x2; surf.w = g_system->getWidth(); |