diff options
author | Einar Johan Trøan Sømåen | 2012-07-19 19:17:05 +0200 |
---|---|---|
committer | Einar Johan Trøan Sømåen | 2012-07-19 19:17:05 +0200 |
commit | a3e8ad4c52f2ad484e94fc8b641e7c7b67b44c04 (patch) | |
tree | d3fc1c23ed6196a24266825f2d77f963d8d98656 /engines/wintermute/Base/font | |
parent | def3cd92570ac8138441cd0e7492d0b7bdc61f91 (diff) | |
download | scummvm-rg350-a3e8ad4c52f2ad484e94fc8b641e7c7b67b44c04.tar.gz scummvm-rg350-a3e8ad4c52f2ad484e94fc8b641e7c7b67b44c04.tar.bz2 scummvm-rg350-a3e8ad4c52f2ad484e94fc8b641e7c7b67b44c04.zip |
WINTERMUTE: Move all the gfx-related files to a subfolder, and rename SDL->OSystem
Diffstat (limited to 'engines/wintermute/Base/font')
-rw-r--r-- | engines/wintermute/Base/font/BFontBitmap.cpp | 2 | ||||
-rw-r--r-- | engines/wintermute/Base/font/BFontTT.cpp | 6 | ||||
-rw-r--r-- | engines/wintermute/Base/font/BFontTT.h | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/engines/wintermute/Base/font/BFontBitmap.cpp b/engines/wintermute/Base/font/BFontBitmap.cpp index badf5ac646..15e14958f8 100644 --- a/engines/wintermute/Base/font/BFontBitmap.cpp +++ b/engines/wintermute/Base/font/BFontBitmap.cpp @@ -31,7 +31,7 @@ #include "engines/wintermute/utils/StringUtil.h"
#include "engines/wintermute/Base/BParser.h"
#include "engines/wintermute/Base/BFrame.h"
-#include "engines/wintermute/Base/BSurface.h"
+#include "engines/wintermute/Base/gfx/base_surface.h"
#include "engines/wintermute/Base/BGame.h"
#include "engines/wintermute/Base/BSubFrame.h"
#include "engines/wintermute/Base/BFrame.h"
diff --git a/engines/wintermute/Base/font/BFontTT.cpp b/engines/wintermute/Base/font/BFontTT.cpp index 4517f580b2..fd3dcb3567 100644 --- a/engines/wintermute/Base/font/BFontTT.cpp +++ b/engines/wintermute/Base/font/BFontTT.cpp @@ -32,8 +32,8 @@ #include "engines/wintermute/utils/PathUtil.h"
#include "engines/wintermute/utils/StringUtil.h"
#include "engines/wintermute/math/MathUtil.h"
-#include "engines/wintermute/Base/BRenderer.h"
-#include "engines/wintermute/Base/BSurface.h"
+#include "engines/wintermute/Base/gfx/base_renderer.h"
+#include "engines/wintermute/Base/gfx/base_surface.h"
#include "engines/wintermute/Base/BParser.h"
#include "engines/wintermute/Base/BGame.h"
#include "engines/wintermute/Base/BFileManager.h"
@@ -363,7 +363,7 @@ CBSurface *CBFontTT::renderTextToTexture(const WideString &text, int width, TTex posY += GetLineHeight();
}
- CBSurfaceSDL *wmeSurface = new CBSurfaceSDL(_gameRef);
+ CBSurfaceOSystem *wmeSurface = new CBSurfaceOSystem(_gameRef);
if (DID_SUCCEED(wmeSurface->CreateFromSDLSurface(surface))) {
SDL_FreeSurface(surface);
return wmeSurface;
diff --git a/engines/wintermute/Base/font/BFontTT.h b/engines/wintermute/Base/font/BFontTT.h index 058fc28755..d2b29a89f8 100644 --- a/engines/wintermute/Base/font/BFontTT.h +++ b/engines/wintermute/Base/font/BFontTT.h @@ -31,7 +31,7 @@ #include "engines/wintermute/Base/font/BFontStorage.h"
#include "engines/wintermute/Base/font/BFont.h"
-#include "engines/wintermute/Base/BSurface.h"
+#include "engines/wintermute/Base/gfx/base_surface.h"
#include "common/rect.h"
#include "graphics/surface.h"
#include "graphics/font.h"
|