mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'develop' of https://github.com/OpenRCT2/OpenRCT2 into develop

This commit is contained in:
IntelOrca 2016-03-02 19:24:01 +00:00
parent 646deebd3a 411e98b778
commit d324084fa2
2 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
contributors.md
View File

@ -58,6 +58,7 @@ Includes all git commit authors. Aliases are GitHub user names.
* Hielke Morsink (Broxzier)
* Lucas Riutzel (jackinloadup)
* Youngjae Yu (YJSoft)
* Chanwoong Kim (kexplo)
## Toolchain
* (Balletie) - OSX
@ -91,7 +92,7 @@ Includes all git commit authors. Aliases are GitHub user names.
* Portuguese (BR) - (kaudy)
* Russian - (Soosisya)
* Simplified Chinese - Naiji Ma (naijim)
* Spanish - (mdtrooper)
* Spanish - (mdtrooper), Josué Acevedo (Wirlie)
* Swedish - (Jinxit), (mharrys), (Slimeyo)
* Traditional Chinese - Harry Lam (daihakken)

18
src/drawing/string.c
View File

@ -584,18 +584,14 @@ void draw_string_centred_raw(rct_drawpixelinfo *dpi, int x, int y, int numLines,
int width = gfx_get_string_width(text);
gfx_draw_string(dpi, text, 254, x - (width / 2), y);
char c;
while ((c = *text++) != 0) {
if (c >= 32) continue;
if (c <= 4) {
text++;
continue;
}
if (c <= 16) continue;
text += 2;
if (c <= 22) continue;
text += 2;
const utf8 *ch = text;
const utf8 *nextCh = 0;
int codepoint = 0;
while ((codepoint = utf8_get_next(ch, (const utf8**)&nextCh)) != 0) {
ch = nextCh;
}
text = ch+1;
y += font_get_line_height(RCT2_GLOBAL(RCT2_ADDRESS_CURRENT_FONT_SPRITE_BASE, uint16));
}