diff options
| author | Max Horn | 2004-03-21 21:20:25 +0000 |
|---|---|---|
| committer | Max Horn | 2004-03-21 21:20:25 +0000 |
| commit | a9789acfc61a057c82c6cc42386afc9b23813c24 (patch) | |
| tree | 3e36be49dd35ceb59ce98f74aec92cd9c60198a4 /backends/sdl | |
| parent | 23dbd0de994ebfc97c65ab9deb96b052d1983426 (diff) | |
| download | scummvm-rg350-a9789acfc61a057c82c6cc42386afc9b23813c24.tar.gz scummvm-rg350-a9789acfc61a057c82c6cc42386afc9b23813c24.tar.bz2 scummvm-rg350-a9789acfc61a057c82c6cc42386afc9b23813c24.zip | |
Moved Surface/Font code into new 'graphics' module
svn-id: r13357
Diffstat (limited to 'backends/sdl')
| -rw-r--r-- | backends/sdl/graphics.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/backends/sdl/graphics.cpp b/backends/sdl/graphics.cpp index 8a2ff446f5..7ebb5e5d41 100644 --- a/backends/sdl/graphics.cpp +++ b/backends/sdl/graphics.cpp @@ -23,7 +23,7 @@ #include "backends/sdl/sdl-common.h" #include "common/scaler.h" #include "common/util.h" -#include "gui/font.h" +#include "graphics/font.h" static const OSystem::GraphicsMode s_supportedGraphicsModes[] = { {"1x", "Normal (no scaling)", GFX_NORMAL}, @@ -1180,7 +1180,7 @@ void OSystem_SDL::displayMessageOnOSD(const char *msg) { if (SDL_LockSurface(_osdSurface)) error("displayMessageOnOSD: SDL_LockSurface failed: %s", SDL_GetError()); - GUI::Surface dst; + Graphics::Surface dst; dst.pixels = _osdSurface->pixels; dst.w = _osdSurface->w; dst.h = _osdSurface->h; @@ -1188,8 +1188,8 @@ void OSystem_SDL::displayMessageOnOSD(const char *msg) { dst.bytesPerPixel = _osdSurface->format->BytesPerPixel; // The font we are going to use: -// const GUI::Font *font = &GUI::g_sysfont; - const GUI::Font *font = &GUI::g_scummfont; +// const Graphics::Font *font = &Graphics::g_sysfont; + const Graphics::Font *font = &Graphics::g_scummfont; // Clear everything with the "transparent" color, i.e. the colorkey SDL_FillRect(_osdSurface, 0, kOSDColorKey); @@ -1236,7 +1236,7 @@ void OSystem_SDL::displayMessageOnOSD(const char *msg) { font->drawString(&dst, lines[i], osdRect.x, osdRect.y + i * lineHeight + vOffset + lineSpacing, osdRect.w, SDL_MapRGB(_osdSurface->format, 255, 255, 255), - GUI::kTextAlignCenter); + Graphics::kTextAlignCenter); } // Finished drawing, so unlock the OSD surface again |