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

some strings added

Browse Source
This commit is contained in:
ddevrien
2014-05-12 16:56:28 +02:00
parent c6fc8c634b
commit df97c22dae
3 changed files with 34 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/addresses.h
View File

@@ -52,7 +52,7 @@
#define RCT2_ADDRESS_CONFIG_FLAGS 0x009AAC74
#define RCT2_ADDRESS_CONFIG_SOUND_QUALITY 0x009AAC77
#define RCT2_ADDRESS_CONFIG_METRIC 0x009AAC78
#define RCT2_ADDRESS_CONFIG_FAHRENHEIT 0x009AAC79
#define RCT2_ADDRESS_CONFIG_TEMPERATURE 0x009AAC79
#define RCT2_ADDRESS_CONFIG_KEYBOARD_SHORTCUTS 0x009AAC7A
#define RCT2_ADDRESS_CONFIG_EDGE_SCROLLING 0x009AACBA
#define RCT2_ADDRESS_CONFIG_CURRENCY 0x009AACBB

40
src/strings.h
View File

@@ -280,6 +280,8 @@ enum {
STR_SUMMARISED_GUESTS_TIP = 1753,
STR_ADMISSION_PRICE = 1756,
STR_OFF = 1775,
STR_ON = 1776,
STR_MUSIC = 1777,
STR_ACTIONS = 1814,
@@ -322,7 +324,7 @@ enum {
STR_SHOW_SUBJECT_TIP = 1937,
STR_CELCIUS_VALUE = 2216,
STR_CELSIUS_VALUE = 2216,
STR_FAHRENHEIT_VALUE = 2217,
STR_PARK_RATING_LABEL = 2220,
@@ -330,14 +332,6 @@ enum {
STR_GUESTS_IN_PARK_LABEL = 2223,
STR_NUMBER_OF_RIDES_LABEL = 2321,
STR_STAFF_LABEL = 2322,
STR_PARK_SIZE_METRIC_LABEL = 2323,
STR_PARK_SIZE_IMPERIAL_LABEL = 2324,
SPR_BUY_LAND_RIGHTS_TIP = 2325,
SPR_BUY_CONSTRUCTION_RIGHTS_TIP = 2326,
STR_PARK_INFORMATION_TIP = 2233,
STR_RECENT_MESSAGES = 2234,
@@ -360,19 +354,43 @@ enum {
STR_CHANGE_VERTICAL_LAND_TIP = 2295,
STR_SOUND_QUALITY = 2317,
STR_SOUND_LOW = 2318,
STR_SOUND_MEDIUM = 2319,
STR_SOUND_HIGH = 2320,
STR_NUMBER_OF_RIDES_LABEL = 2321,
STR_STAFF_LABEL = 2322,
STR_PARK_SIZE_METRIC_LABEL = 2323,
STR_PARK_SIZE_IMPERIAL_LABEL = 2324,
SPR_BUY_LAND_RIGHTS_TIP = 2325,
SPR_BUY_CONSTRUCTION_RIGHTS_TIP = 2326,
STR_CURRENCY = 2328,
STR_DISTANCE_AND_SPEED = 2329,
STR_TEMPERATURE = 2330,
STR_HEIGHT_LABELS = 2331,
STR_UNITS = 2332,
STR_SOUND = 2333,
STR_POUNDS = 2334,
STR_DOLLARS = 2335,
STR_FRANC = 2336,
STR_DEUTSCHMARK = 2337,
STR_YEN = 2338,
STR_PESETA = 2339,
STR_LIRA = 2340,
STR_GUILDERS = 2341,
STR_KRONA = 2342,
STR_EUROS = 2343,
STR_IMPERIAL = 2344,
STR_METRIC = 2345,
STR_DISPLAY = 2346,
//STR_UNITS = 2358,
STR_REAL_VALUES = 2359,
STR_DISPLAY_RESOLUTION = 2360,
STR_TILE_SMOOTHING = 2361,
STR_TILE_SMOOTHING_TIP = 2362,
STR_GRIDLINES = 2363,
STR_GRIDLINES_TIP = 2364,
STR_CELSIUS = 2366,
STR_FAHRENHEIT = 2367,
//STR_NONE = 2368,
STR_LOW = 2369,
STR_AVERAGE = 2370,
@@ -494,6 +512,8 @@ enum {
STR_UNABLE_TO_LOAD_FILE = 3010,
STR_FILE_CONTAINS_INVALID_DATA = 3011,
STR_WHITE = 3055,
STR_TRANSLUCENT = 3056,
STR_CONSTRUCTION_MARKER = 3057,
STR_BEGINNER_PARKS = 3064,

6
src/window_game_bottom_toolbar.c
View File

@@ -471,9 +471,9 @@ static void window_game_bottom_toolbar_draw_right_panel(rct_drawpixelinfo *dpi,
y += 11;
temperature = RCT2_GLOBAL(RCT2_ADDRESS_CURRENT_TEMPERATURE, sint8);
format = STR_CELCIUS_VALUE;
if (RCT2_GLOBAL(RCT2_ADDRESS_CONFIG_FAHRENHEIT, uint8)) {
temperature = climate_celcius_to_fahrenheit(temperature);
format = STR_CELSIUS_VALUE;
if (RCT2_GLOBAL(RCT2_ADDRESS_CONFIG_TEMPERATURE, uint8)) {
temperature = climate_celsius_to_fahrenheit(temperature);
format = STR_FAHRENHEIT_VALUE;
}
*((short*)0x013CE952) = temperature;