From 0908aa7bb751a11cc035ceec3af282fed622f72c Mon Sep 17 00:00:00 2001
From: Maarten ter Huurne <maarten@treewalker.org>
Date: Fri, 18 Jul 2014 05:11:35 +0200
Subject: [PATCH] Removed support for multi-line text drawing

When trying to test the previous commit, I couldn't find any place in
the application where strings containing newlines are drawn. So I'm
assuming this is an unnecessary feature, until someone comes up with
a test case proving otherwise.

Yeah, I'm too lazy to review all the code that draws text...
---
 src/font.cpp | 25 +------------------------
 src/font.h   |  3 ---
 2 files changed, 1 insertion(+), 27 deletions(-)

diff --git a/src/font.cpp b/src/font.cpp
index 82c08f8..7dfe485 100644
--- a/src/font.cpp
+++ b/src/font.cpp
@@ -59,30 +59,7 @@ int Font::getTextWidth(const char *text)
 	else return 1;
 }
 
-void Font::write(Surface *surface, const string &text,
-			int x, int y, HAlign halign, VAlign valign)
-{
-	if (!font) {
-		return;
-	}
-
-	size_t pos = text.find('\n', 0);
-	if (pos == string::npos) {
-		writeLine(surface, text, x, y, halign, valign);
-	} else {
-		size_t prev = 0;
-		do {
-			writeLine(surface, text.substr(prev, pos - prev),
-					x, y, halign, valign);
-			y += lineSpacing;
-			prev = pos + 1;
-			pos = text.find('\n', prev);
-		} while (pos != string::npos);
-		writeLine(surface, text.substr(prev), x, y, halign, valign);
-	}
-}
-
-void Font::writeLine(Surface *surface, std::string const& text,
+void Font::write(Surface *surface, std::string const& text,
 				int x, int y, HAlign halign, VAlign valign)
 {
 	if (!font) {
diff --git a/src/font.h b/src/font.h
index 68dde24..e66945d 100644
--- a/src/font.h
+++ b/src/font.h
@@ -41,9 +41,6 @@ public:
 private:
 	Font(TTF_Font *font);
 
-	void writeLine(Surface *surface, std::string const& text,
-				int x, int y, HAlign halign, VAlign valign);
-
 	TTF_Font *font;
 	int lineSpacing;
 };