dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

(svn r25567) -Codechange: Revive dead DrawStringParams as FontState.

Browse Source
This commit is contained in:
frosch
2013-07-06 18:54:26 +00:00
parent ae279584cc
commit 8701f523ae
3 changed files with 45 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/gfx_layout.cpp
View File

@@ -410,11 +410,11 @@ Layouter::Layouter(const char *str, int maxw, TextColour colour, FontSize fontsi
const CharType *buffer_last = lastof(this->buffer);
CharType *buff = this->buffer;
TextColour cur_colour = colour, prev_colour = colour;
FontState state(colour, fontsize);
WChar c = 0;
do {
Font *f = new Font(fontsize, cur_colour);
Font *f = new Font(state.fontsize, state.cur_colour);
CharType *buff_begin = buff;
FontMap fontMapping;
@@ -428,14 +428,13 @@ Layouter::Layouter(const char *str, int maxw, TextColour colour, FontSize fontsi
if (c == '\0' || c == '\n') {
break;
} else if (c >= SCC_BLUE && c <= SCC_BLACK) {
prev_colour = cur_colour;
cur_colour = (TextColour)(c - SCC_BLUE);
state.SetColour((TextColour)(c - SCC_BLUE));
} else if (c == SCC_PREVIOUS_COLOUR) { // Revert to the previous colour.
Swap(prev_colour, cur_colour);
state.SetPreviousColour();
} else if (c == SCC_TINYFONT) {
fontsize = FS_SMALL;
state.SetFontSize(FS_SMALL);
} else if (c == SCC_BIGFONT) {
fontsize = FS_LARGE;
state.SetFontSize(FS_LARGE);
} else {
buff += AppendToBuffer(buff, buffer_last, c);
continue;
@@ -447,7 +446,7 @@ Layouter::Layouter(const char *str, int maxw, TextColour colour, FontSize fontsi
} else {
delete f;
}
f = new Font(fontsize, cur_colour);
f = new Font(state.fontsize, state.cur_colour);
}
/* Better safe than sorry. */