mirror of https://github.com/OpenRCT2/OpenRCT2.git
Merge pull request #7893 from Gymnasiast/fix/7804
This commit is contained in:
commit
81b778f1c6
|
@ -33,6 +33,8 @@
|
||||||
- Fix: [#7793] Duplicate private keys generated.
|
- Fix: [#7793] Duplicate private keys generated.
|
||||||
- Fix: [#7817] No sprite font glyph for interpunct.
|
- Fix: [#7817] No sprite font glyph for interpunct.
|
||||||
- Fix: [#7823] You can build mazes in pause mode.
|
- Fix: [#7823] You can build mazes in pause mode.
|
||||||
|
- Fix: [#7804] Russian ride descriptions are cut off.
|
||||||
|
- Fix: [#7872] CJK tooltips are often cut off.
|
||||||
|
|
||||||
0.2.0 (2018-06-10)
|
0.2.0 (2018-06-10)
|
||||||
------------------------------------------------------------------------
|
------------------------------------------------------------------------
|
||||||
|
|
|
@ -84,7 +84,7 @@ void window_tooltip_show(rct_string_id id, int32_t x, int32_t y)
|
||||||
|
|
||||||
char* buffer = gCommonStringFormatBuffer;
|
char* buffer = gCommonStringFormatBuffer;
|
||||||
|
|
||||||
format_string(buffer, 256, id, gCommonFormatArgs);
|
format_string(buffer, sizeof(gCommonStringFormatBuffer), id, gCommonFormatArgs);
|
||||||
gCurrentFontSpriteBase = FONT_SPRITE_BASE_MEDIUM;
|
gCurrentFontSpriteBase = FONT_SPRITE_BASE_MEDIUM;
|
||||||
|
|
||||||
int32_t tooltip_text_width;
|
int32_t tooltip_text_width;
|
||||||
|
|
|
@ -107,7 +107,7 @@ static void DrawText(rct_drawpixelinfo* dpi, int32_t x, int32_t y, TextPaint* pa
|
||||||
|
|
||||||
static void DrawText(rct_drawpixelinfo* dpi, int32_t x, int32_t y, TextPaint* paint, rct_string_id format, void* args)
|
static void DrawText(rct_drawpixelinfo* dpi, int32_t x, int32_t y, TextPaint* paint, rct_string_id format, void* args)
|
||||||
{
|
{
|
||||||
utf8 buffer[256];
|
utf8 buffer[512];
|
||||||
format_string(buffer, sizeof(buffer), format, args);
|
format_string(buffer, sizeof(buffer), format, args);
|
||||||
DrawText(dpi, x, y, paint, buffer);
|
DrawText(dpi, x, y, paint, buffer);
|
||||||
}
|
}
|
||||||
|
@ -134,7 +134,7 @@ static void DrawTextEllipsisedCompat(
|
||||||
_legacyPaint.SpriteBase = FONT_SPRITE_BASE_MEDIUM;
|
_legacyPaint.SpriteBase = FONT_SPRITE_BASE_MEDIUM;
|
||||||
gCurrentFontSpriteBase = FONT_SPRITE_BASE_MEDIUM;
|
gCurrentFontSpriteBase = FONT_SPRITE_BASE_MEDIUM;
|
||||||
|
|
||||||
utf8 buffer[256];
|
utf8 buffer[512];
|
||||||
format_string(buffer, sizeof(buffer), format, args);
|
format_string(buffer, sizeof(buffer), format, args);
|
||||||
gfx_clip_string(buffer, width);
|
gfx_clip_string(buffer, width);
|
||||||
|
|
||||||
|
@ -206,7 +206,7 @@ void gfx_draw_string_right_clipped(
|
||||||
int32_t gfx_draw_string_left_wrapped(
|
int32_t gfx_draw_string_left_wrapped(
|
||||||
rct_drawpixelinfo* dpi, void* args, int32_t x, int32_t y, int32_t width, rct_string_id format, uint8_t colour)
|
rct_drawpixelinfo* dpi, void* args, int32_t x, int32_t y, int32_t width, rct_string_id format, uint8_t colour)
|
||||||
{
|
{
|
||||||
utf8 buffer[256];
|
utf8 buffer[512];
|
||||||
format_string(buffer, sizeof(buffer), format, args);
|
format_string(buffer, sizeof(buffer), format, args);
|
||||||
|
|
||||||
gCurrentFontSpriteBase = FONT_SPRITE_BASE_MEDIUM;
|
gCurrentFontSpriteBase = FONT_SPRITE_BASE_MEDIUM;
|
||||||
|
@ -225,7 +225,7 @@ int32_t gfx_draw_string_left_wrapped(
|
||||||
int32_t gfx_draw_string_centred_wrapped(
|
int32_t gfx_draw_string_centred_wrapped(
|
||||||
rct_drawpixelinfo* dpi, void* args, int32_t x, int32_t y, int32_t width, rct_string_id format, uint8_t colour)
|
rct_drawpixelinfo* dpi, void* args, int32_t x, int32_t y, int32_t width, rct_string_id format, uint8_t colour)
|
||||||
{
|
{
|
||||||
utf8 buffer[256];
|
utf8 buffer[512];
|
||||||
format_string(buffer, sizeof(buffer), format, args);
|
format_string(buffer, sizeof(buffer), format, args);
|
||||||
|
|
||||||
gCurrentFontSpriteBase = FONT_SPRITE_BASE_MEDIUM;
|
gCurrentFontSpriteBase = FONT_SPRITE_BASE_MEDIUM;
|
||||||
|
|
|
@ -35,7 +35,7 @@
|
||||||
#include "Date.h"
|
#include "Date.h"
|
||||||
#include "Localisation.h"
|
#include "Localisation.h"
|
||||||
|
|
||||||
char gCommonStringFormatBuffer[256];
|
char gCommonStringFormatBuffer[512];
|
||||||
uint8_t gCommonFormatArgs[80];
|
uint8_t gCommonFormatArgs[80];
|
||||||
uint8_t gMapTooltipFormatArgs[40];
|
uint8_t gMapTooltipFormatArgs[40];
|
||||||
|
|
||||||
|
|
|
@ -63,7 +63,7 @@ extern const char real_name_initials[16];
|
||||||
extern const char* real_names[1024];
|
extern const char* real_names[1024];
|
||||||
|
|
||||||
extern utf8 gUserStrings[MAX_USER_STRINGS][USER_STRING_MAX_LENGTH];
|
extern utf8 gUserStrings[MAX_USER_STRINGS][USER_STRING_MAX_LENGTH];
|
||||||
extern char gCommonStringFormatBuffer[256];
|
extern char gCommonStringFormatBuffer[512];
|
||||||
extern uint8_t gCommonFormatArgs[80];
|
extern uint8_t gCommonFormatArgs[80];
|
||||||
extern uint8_t gMapTooltipFormatArgs[40];
|
extern uint8_t gMapTooltipFormatArgs[40];
|
||||||
extern bool gDebugStringFormatting;
|
extern bool gDebugStringFormatting;
|
||||||
|
|
|
@ -103,11 +103,11 @@ void banner_paint(paint_session* session, uint8_t direction, int32_t height, con
|
||||||
}
|
}
|
||||||
if (gConfigGeneral.upper_case_banners)
|
if (gConfigGeneral.upper_case_banners)
|
||||||
{
|
{
|
||||||
format_string_to_upper(gCommonStringFormatBuffer, 256, string_id, gCommonFormatArgs);
|
format_string_to_upper(gCommonStringFormatBuffer, sizeof(gCommonStringFormatBuffer), string_id, gCommonFormatArgs);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
format_string(gCommonStringFormatBuffer, 256, string_id, gCommonFormatArgs);
|
format_string(gCommonStringFormatBuffer, sizeof(gCommonStringFormatBuffer), string_id, gCommonFormatArgs);
|
||||||
}
|
}
|
||||||
|
|
||||||
gCurrentFontSpriteBase = FONT_SPRITE_BASE_TINY;
|
gCurrentFontSpriteBase = FONT_SPRITE_BASE_TINY;
|
||||||
|
|
|
@ -454,11 +454,12 @@ static void sub_6A4101(
|
||||||
}
|
}
|
||||||
if (gConfigGeneral.upper_case_banners)
|
if (gConfigGeneral.upper_case_banners)
|
||||||
{
|
{
|
||||||
format_string_to_upper(gCommonStringFormatBuffer, 256, string_id, gCommonFormatArgs);
|
format_string_to_upper(
|
||||||
|
gCommonStringFormatBuffer, sizeof(gCommonStringFormatBuffer), string_id, gCommonFormatArgs);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
format_string(gCommonStringFormatBuffer, 256, string_id, gCommonFormatArgs);
|
format_string(gCommonStringFormatBuffer, sizeof(gCommonStringFormatBuffer), string_id, gCommonFormatArgs);
|
||||||
}
|
}
|
||||||
|
|
||||||
gCurrentFontSpriteBase = FONT_SPRITE_BASE_TINY;
|
gCurrentFontSpriteBase = FONT_SPRITE_BASE_TINY;
|
||||||
|
|
Loading…
Reference in New Issue