GRAPHICS: Get rid of kSODFont (ScummFont)

OSD is now using the kGUIFont instead. The main advantage is that the kGUIFont can be used for translated text while only ASCII characters were present in ScummFont.
scummvm · Jun 6, 2011 · 592cca5 · 592cca5
1 parent 72080d8
commit 592cca5
Show file tree

Hide file tree

Showing 8 changed files with 7 additions and 341 deletions.
diff --git a/audio/softsynth/mt32.cpp b/audio/softsynth/mt32.cpp
@@ -135,7 +135,7 @@ static int eatSystemEvents() {
 }
 
 static void drawProgress(float progress) {
-	const Graphics::Font &font(*FontMan.getFontByUsage(Graphics::FontManager::kOSDFont));
+	const Graphics::Font &font(*FontMan.getFontByUsage(Graphics::FontManager::kGUIFont));
 	Graphics::Surface *screen = g_system->lockScreen();
 
 	assert(screen);
@@ -174,7 +174,7 @@ static void drawProgress(float progress) {
 }
 
 static void drawMessage(int offset, const Common::String &text) {
-	const Graphics::Font &font(*FontMan.getFontByUsage(Graphics::FontManager::kOSDFont));
+	const Graphics::Font &font(*FontMan.getFontByUsage(Graphics::FontManager::kGUIFont));
 	Graphics::Surface *screen = g_system->lockScreen();
 
 	assert(screen);

diff --git a/backends/graphics/opengl/opengl-graphics.cpp b/backends/graphics/opengl/opengl-graphics.cpp
@@ -1385,7 +1385,7 @@ const char *OpenGLGraphicsManager::getCurrentModeName() {
 #ifdef USE_OSD
 void OpenGLGraphicsManager::updateOSD() {
 	// The font we are going to use:
-	const Graphics::Font *font = FontMan.getFontByUsage(Graphics::FontManager::kOSDFont);
+	const Graphics::Font *font = FontMan.getFontByUsage(Graphics::FontManager::kGUIFont);
 
 	if (_osdSurface.w != _osdTexture->getWidth() || _osdSurface.h != _osdTexture->getHeight())
 		_osdSurface.create(_osdTexture->getWidth(), _osdTexture->getHeight(), _overlayFormat);

diff --git a/backends/graphics/sdl/sdl-graphics.cpp b/backends/graphics/sdl/sdl-graphics.cpp
@@ -2060,7 +2060,7 @@ void SdlGraphicsManager::displayMessageOnOSD(const char *msg) {
 	                                   _osdSurface->format->Bshift, _osdSurface->format->Ashift);
 
 	// The font we are going to use:
-	const Graphics::Font *font = FontMan.getFontByUsage(Graphics::FontManager::kOSDFont);
+	const Graphics::Font *font = FontMan.getFontByUsage(Graphics::FontManager::kGUIFont);
 
 	// Clear everything with the "transparent" color, i.e. the colorkey
 	SDL_FillRect(_osdSurface, 0, kOSDColorKey);

diff --git a/graphics/font.h b/graphics/font.h
@@ -114,18 +114,6 @@ class Font {
 	int wordWrapText(const Common::String &str, int maxWidth, Common::Array<Common::String> &lines) const;
 };
 
-/**
- * A SCUMM style font.
- */
-class ScummFont : public Font {
-public:
-	virtual int getFontHeight() const { return 8; }
-	virtual int getMaxCharWidth() const { return 8; }
-
-	virtual int getCharWidth(byte chr) const;
-	virtual void drawChar(Surface *dst, byte chr, int x, int y, uint32 color) const;
-};
-
 typedef uint16 bitmap_t; /* bitmap image unit size*/
 
 struct BBX {

diff --git a/graphics/fontman.cpp b/graphics/fontman.cpp
@@ -26,26 +26,22 @@ DECLARE_SINGLETON(Graphics::FontManager);
 
 namespace Graphics {
 
-const ScummFont *g_scummfont = 0;
 FORWARD_DECLARE_FONT(g_sysfont);
 FORWARD_DECLARE_FONT(g_sysfont_big);
 FORWARD_DECLARE_FONT(g_consolefont);
 
 FontManager::FontManager() {
 	// This assert should *never* trigger, because
 	// FontManager is a singleton, thus there is only
-	// one instance of it per time. (g_scummfont gets
+	// one instance of it per time. (g_sysfont gets
 	// reset to 0 in the desctructor of this class).
-	assert(g_scummfont == 0);
-	g_scummfont = new ScummFont;
+	assert(g_sysfont == 0);
 	INIT_FONT(g_sysfont);
 	INIT_FONT(g_sysfont_big);
 	INIT_FONT(g_consolefont);
 }
 
 FontManager::~FontManager() {
-	delete g_scummfont;
-	g_scummfont = 0;
 	delete g_sysfont;
 	g_sysfont = 0;
 	delete g_sysfont_big;
@@ -58,7 +54,6 @@ const struct {
 	const char *name;
 	FontManager::FontUsage id;
 } builtinFontNames[] = {
-	{ "builtinOSD", FontManager::kOSDFont },
 	{ "builtinConsole", FontManager::kConsoleFont },
 	{ "fixed5x8.bdf", FontManager::kConsoleFont },
 	{ "fixed5x8-iso-8859-1.bdf", FontManager::kConsoleFont },
@@ -69,7 +64,7 @@ const struct {
 	{ "helvB12.bdf", FontManager::kBigGUIFont },
 	{ "helvB12-iso-8859-1.bdf", FontManager::kBigGUIFont },
 	{ "helvB12-ascii.bdf", FontManager::kBigGUIFont },
-	{ 0, FontManager::kOSDFont }
+	{ 0, FontManager::kConsoleFont }
 };
 
 const Font *FontManager::getFontByName(const Common::String &name) const {
@@ -84,8 +79,6 @@ const Font *FontManager::getFontByName(const Common::String &name) const {
 
 const Font *FontManager::getFontByUsage(FontUsage usage) const {
 	switch (usage) {
-	case kOSDFont:
-		return g_scummfont;
 	case kConsoleFont:
 		return g_consolefont;
 	case kGUIFont:

diff --git a/graphics/fontman.h b/graphics/fontman.h
@@ -36,7 +36,6 @@ class Font;
 class FontManager : public Common::Singleton<FontManager> {
 public:
 	enum FontUsage {
-		kOSDFont = 0,
 		kConsoleFont = 1,
 		kGUIFont = 2,
 		kBigGUIFont = 3