mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-15 11:03:00 +01:00
Code Issues Releases Wiki Activity

Fix compilation warnings (#3709)

Browse Source
This commit is contained in:
Michał Janiszewski
2016-05-23 13:08:25 +02:00
committed by Ted John
parent 603a255567
commit 11cbdb0299
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/paint/map_element/scenery_multiple.c
View File

@@ -94,7 +94,7 @@ const utf8 *scenery_multiple_sign_fit_text(const utf8 *str, rct_large_scenery_te
strncpy(fitStr, str, sizeof(fitStr) - 1);
int w = 0;
uint32 codepoint;
while (w <= text->max_width && (codepoint = utf8_get_next(fitStrEnd, &fitStrEnd)) != 0) {
while (w <= text->max_width && (codepoint = utf8_get_next(fitStrEnd, (const utf8**)&fitStrEnd)) != 0) {
if (height) {
w += scenery_multiple_sign_get_glyph(text, codepoint)->height;
} else {
@@ -273,14 +273,14 @@ void scenery_multiple_paint(uint8 direction, uint16 height, rct_map_element *map
utf8 *spacesrc = 0;
utf8 *spacedst = 0;
int w = 0;
uint32 codepoint = utf8_get_next(src, &src);
uint32 codepoint = utf8_get_next(src, (const utf8**)&src);
do {
w += scenery_multiple_sign_get_glyph(text, codepoint)->width;
if (codepoint == ' ') {
spacesrc = src;
spacedst = dst;
}
} while(w <= text->max_width && (dst = utf8_write_codepoint(dst, codepoint)) && (srcold = src) && (codepoint = utf8_get_next(src, &src)));
} while(w <= text->max_width && (dst = utf8_write_codepoint(dst, codepoint)) && (srcold = src) && (codepoint = utf8_get_next(src, (const utf8**)&src)));
src = srcold;
if (spacesrc && codepoint) {
*spacedst = 0;