Minor fixes for mapgen

This commit is contained in:
Michał Janiszewski 2015-12-29 12:03:16 +01:00
parent 4e465edeea
commit bcfdbbd25b
3 changed files with 4 additions and 4 deletions

View File

@ -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,

View File

@ -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);

View File

@ -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()