mirror of https://github.com/OpenRCT2/OpenRCT2.git
fix #2515
This commit is contained in:
parent
57207bac34
commit
0ec91d62b5
16
src/config.c
16
src/config.c
|
@ -818,10 +818,20 @@ void config_apply_to_old_addresses()
|
||||||
RCT2_GLOBAL(RCT2_ADDRESS_CONFIG_METRIC, sint8) = gConfigGeneral.measurement_format;
|
RCT2_GLOBAL(RCT2_ADDRESS_CONFIG_METRIC, sint8) = gConfigGeneral.measurement_format;
|
||||||
RCT2_GLOBAL(RCT2_ADDRESS_CONFIG_TEMPERATURE, sint8) = gConfigGeneral.temperature_format;
|
RCT2_GLOBAL(RCT2_ADDRESS_CONFIG_TEMPERATURE, sint8) = gConfigGeneral.temperature_format;
|
||||||
RCT2_GLOBAL(RCT2_ADDRESS_CONFIG_CONSTRUCTION_MARKER, uint8) = gConfigGeneral.construction_marker_colour;
|
RCT2_GLOBAL(RCT2_ADDRESS_CONFIG_CONSTRUCTION_MARKER, uint8) = gConfigGeneral.construction_marker_colour;
|
||||||
RCT2_GLOBAL(RCT2_ADDRESS_CONFIG_HEIGHT_MARKERS, sint16) = (gConfigGeneral.measurement_format + 1) * 256;
|
if (gConfigGeneral.show_height_as_units) {
|
||||||
if (gConfigGeneral.show_height_as_units)
|
|
||||||
RCT2_GLOBAL(RCT2_ADDRESS_CONFIG_HEIGHT_MARKERS, sint16) = 0;
|
RCT2_GLOBAL(RCT2_ADDRESS_CONFIG_HEIGHT_MARKERS, sint16) = 0;
|
||||||
|
} else {
|
||||||
|
switch (gConfigGeneral.measurement_format) {
|
||||||
|
default:
|
||||||
|
case MEASUREMENT_FORMAT_IMPERIAL:
|
||||||
|
RCT2_GLOBAL(RCT2_ADDRESS_CONFIG_HEIGHT_MARKERS, sint16) = 1 * 256;
|
||||||
|
break;
|
||||||
|
case MEASUREMENT_FORMAT_METRIC:
|
||||||
|
case MEASUREMENT_FORMAT_SI:
|
||||||
|
RCT2_GLOBAL(RCT2_ADDRESS_CONFIG_HEIGHT_MARKERS, sint16) = 2 * 256;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
int configFlags = 0;
|
int configFlags = 0;
|
||||||
if (gConfigGeneral.always_show_gridlines)
|
if (gConfigGeneral.always_show_gridlines)
|
||||||
configFlags |= CONFIG_FLAG_ALWAYS_SHOW_GRIDLINES;
|
configFlags |= CONFIG_FLAG_ALWAYS_SHOW_GRIDLINES;
|
||||||
|
|
Loading…
Reference in New Issue