ZVISION: Delete unused code

2 files changed, 0 insertions, 115 deletions

diff --git a/engines/zvision/graphics/truetype_font.cpp b/engines/zvision/graphics/truetype_font.cpp
index 1a0e92087c..2dbd7ca358 100644
--- a/engines/zvision/graphics/truetype_font.cpp
+++ b/engines/zvision/graphics/truetype_font.cpp
@@ -36,82 +36,6 @@
 
 namespace ZVision {
 
-TruetypeFont::TruetypeFont(ZVision *engine, int32 fontHeight)
-	: _engine(engine),
-	  _fontHeight(fontHeight),
-	  _font(0),
-	  _lineHeight(0),
-	  _maxCharWidth(0),
-	  _maxCharHeight(0) {
-}
-
-TruetypeFont::~TruetypeFont(void) {
-	delete _font;
-}
-
-bool TruetypeFont::loadFile(const Common::String &filename) {
-	Common::File file;
-
-	bool fileOpened = false;
-	if (!Common::File::exists(filename)) {
-		debug("TTF font file %s was not found. Reverting to arial.ttf", filename.c_str());
-		fileOpened = file.open("arial.ttf");
-	} else {
-		fileOpened = file.open(filename);
-	}
-
-	if (!fileOpened) {
-		debug("TTF file could not be opened");
-		return false;
-	}
-
-	_font = Graphics::loadTTFFont(file, _fontHeight);
-	_lineHeight = _font->getFontHeight();
-
-	return true;
-}
-
-Graphics::Surface *TruetypeFont::drawTextToSurface(const Common::String &text, uint16 textColor, int maxWidth, int maxHeight, Graphics::TextAlign align, bool wrap) {
-	if (text.equals("")) {
-		return nullptr;
-	}
-
-	Graphics::Surface *surface = new Graphics::Surface();
-
-	if (!wrap) {
-		int width = MIN(_font->getStringWidth(text), maxWidth);
-		surface->create(width, _lineHeight, Graphics::PixelFormat(2, 5, 6, 5, 0, 11, 5, 0, 0));
-		// TODO: Add better alpha support by getting the pixels from the backbuffer.
-		// However doing that requires some kind of caching system so future text doesn't try to use this text as it's alpha background.
-		surface->fillRect(Common::Rect(0, 0, surface->w, surface->h), 0);
-
-		_font->drawString(surface, text, 0, 0, maxWidth, textColor, align);
-		return surface;
-	}
-
-	Common::Array<Common::String> lines;
-	_font->wordWrapText(text, maxWidth, lines);
-
-	while (maxHeight > 0 && (int)lines.size() * _lineHeight > maxHeight) {
-		lines.pop_back();
-	}
-	if (lines.size() == 0) {
-		delete surface;
-		return nullptr;
-	}
-
-	surface->create(maxWidth, lines.size() * _lineHeight, Graphics::PixelFormat(2, 5, 6, 5, 0, 11, 5, 0, 0));
-	surface->fillRect(Common::Rect(0, 0, surface->w, surface->h), 0);
-
-	int heightOffset = 0;
-	for (Common::Array<Common::String>::iterator it = lines.begin(); it != lines.end(); it++) {
-		_font->drawString(surface, *it, 0, 0 + heightOffset, maxWidth, textColor, align);
-		heightOffset += _lineHeight;
-	}
-
-	return surface;
-}
-
 StyledTTFont::StyledTTFont(ZVision *engine) {
 	_engine = engine;
 	_style = 0;
diff --git a/engines/zvision/graphics/truetype_font.h b/engines/zvision/graphics/truetype_font.h
index 30ef1c73a3..b5fac4af8a 100644
--- a/engines/zvision/graphics/truetype_font.h
+++ b/engines/zvision/graphics/truetype_font.h
@@ -36,45 +36,6 @@ namespace ZVision {
 
 class ZVision;
 
-class TruetypeFont {
-public:
-	TruetypeFont(ZVision *engine, int32 fontHeight);
-	~TruetypeFont();
-
-private:
-	ZVision *_engine;
-	Graphics::Font *_font;
-	int _lineHeight;
-
-	size_t _maxCharWidth;
-	size_t _maxCharHeight;
-
-public:
-	int32 _fontHeight;
-
-public:
-	/**
-	 * Loads a .ttf file into memory. This must be called
-	 * before any calls to drawTextToSurface
-	 *
-	 * @param filename    The file name of the .ttf file to load
-	 */
-	bool loadFile(const Common::String &filename);
-	/**
-	 * Renders the supplied text to a Surface using 0x0 as the
-	 * background color.
-	 *
-	 * @param text         The to render
-	 * @param textColor    The color to render the text with
-	 * @param maxWidth     The max width the text should take up.
-	 * @param maxHeight    The max height the text should take up.
-	 * @param align        The alignment of the text within the bounds of maxWidth
-	 * @param wrap         If true, any words extending past maxWidth will wrap to a new line. If false, ellipses will be rendered to show that the text didn't fit
-	 * @return             A Surface containing the rendered text
-	 */
-	Graphics::Surface *drawTextToSurface(const Common::String &text, uint16 textColor, int maxWidth, int maxHeight, Graphics::TextAlign align, bool wrap);
-};
-
 // Styled TTF
 class StyledTTFont {
 public: