From bcfdbbd25b6e43d62634d32251aac522bd589206 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Janiszewski?= Date: Tue, 29 Dec 2015 12:03:16 +0100 Subject: [PATCH] Minor fixes for mapgen --- src/localisation/format_codes.h | 2 +- src/localisation/localisation.c | 2 +- src/windows/mapgen.c | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/localisation/format_codes.h b/src/localisation/format_codes.h index fd7d42c3f0..52b3033ed6 100644 --- a/src/localisation/format_codes.h +++ b/src/localisation/format_codes.h @@ -57,7 +57,7 @@ enum { FORMAT_INLINE_SPRITE = 23, // Argument format codes - FORMAT_ARGUMENT_CODE_START = 123, + FORMAT_ARGUMENT_CODE_START = 123, // 'z' == 122 or 0x7A FORMAT_COMMA32 = 123, FORMAT_INT32, FORMAT_COMMA2DP32, diff --git a/src/localisation/localisation.c b/src/localisation/localisation.c index 4fb0e14b1b..697178f29f 100644 --- a/src/localisation/localisation.c +++ b/src/localisation/localisation.c @@ -750,7 +750,7 @@ void format_string_part_from_raw(utf8 **dest, const utf8 *src, char **args) } } else if (code <= 'z') { *(*dest)++ = code; - } else if (code < 142 || code == FORMAT_COMMA1DP16) { + } else if (code < FORMAT_COLOUR_CODE_START || code == FORMAT_COMMA1DP16) { format_string_code(code, dest, args); } else { *dest = utf8_write_codepoint(*dest, code); diff --git a/src/windows/mapgen.c b/src/windows/mapgen.c index 03cb6a5e18..f95f875ad9 100644 --- a/src/windows/mapgen.c +++ b/src/windows/mapgen.c @@ -391,7 +391,7 @@ static uint32 window_mapgen_page_hold_down_widgets[] = { #pragma endregion -const int window_mapgen_tab_animation_loops[] = { 16, 16 }; +const int window_mapgen_tab_animation_loops[] = { 16, 16, 16 }; #define MINIMUM_MAP_SIZE_TECHNICAL 15 #define MAXIMUM_MAP_SIZE_TECHNICAL 256 @@ -429,7 +429,7 @@ static int _placeTrees = 1; static int _simplex_low = 6; static int _simplex_high = 10; -static sint16 _simplex_base_freq = 60; +static sint32 _simplex_base_freq = 60; static int _simplex_octaves = 4; rct_window *window_mapgen_open()