summaryrefslogtreecommitdiff
path: root/src/gfx.cpp
diff options
context:
space:
mode:
authorrubidium <rubidium@openttd.org>2013-11-16 20:32:55 +0000
committerrubidium <rubidium@openttd.org>2013-11-16 20:32:55 +0000
commit6449e96f1aa92b6d8043773e85e23d837302519a (patch)
tree90326d908bd5ef48a89e0cc2156d15f631534b0f /src/gfx.cpp
parentb9e4697d8a3eb40495a263936861f33b31fc761e (diff)
downloadopenttd-6449e96f1aa92b6d8043773e85e23d837302519a.tar.xz
(svn r26016) -Codechange: prepare for some class renames
Diffstat (limited to 'src/gfx.cpp')
-rw-r--r--src/gfx.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/gfx.cpp b/src/gfx.cpp
index d02451774..b16d30e2d 100644
--- a/src/gfx.cpp
+++ b/src/gfx.cpp
@@ -339,7 +339,7 @@ static void SetColourRemap(TextColour colour)
* @return In case of left or center alignment the right most pixel we have drawn to.
* In case of right alignment the left most pixel we have drawn to.
*/
-static int DrawLayoutLine(const ParagraphLayout::Line *line, int y, int left, int right, StringAlignment align, bool underline, bool truncation)
+static int DrawLayoutLine(const ParagraphLayouter::Line *line, int y, int left, int right, StringAlignment align, bool underline, bool truncation)
{
if (line->countRuns() == 0) return 0;
@@ -419,7 +419,7 @@ static int DrawLayoutLine(const ParagraphLayout::Line *line, int y, int left, in
}
for (int run_index = 0; run_index < line->countRuns(); run_index++) {
- const ParagraphLayout::VisualRun *run = line->getVisualRun(run_index);
+ const ParagraphLayouter::VisualRun *run = line->getVisualRun(run_index);
const Font *f = (const Font*)run->getFont();
FontCache *fc = f->fc;
@@ -640,8 +640,8 @@ int DrawStringMultiLine(int left, int right, int top, int bottom, const char *st
int last_line = top;
int first_line = bottom;
- for (const ParagraphLayout::Line **iter = layout.Begin(); iter != layout.End(); iter++) {
- const ParagraphLayout::Line *line = *iter;
+ for (const ParagraphLayouter::Line **iter = layout.Begin(); iter != layout.End(); iter++) {
+ const ParagraphLayouter::Line *line = *iter;
int line_height = line->getLeading();
if (y >= top && y < bottom) {