mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2025-12-23 15:52:55 +01:00
Code Issues Releases Wiki Activity

Select size strings now use args

Browse Source
This commit is contained in:
Robert Jordan
2015-05-13 11:38:44 -04:00
parent fe8ba41531
commit a8ec43f065
8 changed files with 21 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
data/language/english_uk.txt
View File

@@ -3462,8 +3462,6 @@ STR_5125 :All destructable
STR_5126 :Random title music
STR_5127 :{SMALLFONT}{BLACK}Disable land elevation
STR_5128 :Selection size
STR_5129 :Enter selection size between 0 and 64
STR_5130 :Enter selection size between 1 and 64
STR_5131 :Enter selection size between 1 and 7
STR_5132 :Map size
STR_5133 :Enter map size between 50 and 256
STR_5129 :Enter selection size between {COMMA16} and {COMMA16}
STR_5130 :Map size
STR_5131 :Enter map size between {COMMA16} and {COMMA16}

2
src/interface/window.c
View File

@@ -38,6 +38,8 @@
rct_window* g_window_list = RCT2_ADDRESS(RCT2_ADDRESS_WINDOW_LIST, rct_window);
uint8 TextInputDescriptionArgs[8];
// converted from uint16 values at 0x009A41EC - 0x009A4230
// these are percentage coordinates of the viewport to center to, if a window is obscuring a location, the next is tried
float window_scroll_locations[][2] = {

1
src/interface/window.h
View File

@@ -30,6 +30,7 @@
struct rct_window;
union rct_window_event;
extern uint8 TextInputDescriptionArgs[8];
typedef void wndproc(struct rct_window*, union rct_window_event*);

4
src/windows/clear_scenery.c
View File

@@ -194,7 +194,9 @@ static void window_clear_scenery_textinput()
static void window_clear_scenery_inputsize(rct_window *w)
{
window_text_input_open(w, WIDX_PREVIEW, 5128, 5131, STR_NONE, STR_NONE, 3);
((uint16*)TextInputDescriptionArgs)[0] = 1;
((uint16*)TextInputDescriptionArgs)[1] = 7;
window_text_input_open(w, WIDX_PREVIEW, 5128, 5129, STR_NONE, STR_NONE, 3);
}
/**

2
src/windows/land.c
View File

@@ -340,6 +340,8 @@ static void window_land_textinput()
static void window_land_inputsize(rct_window *w)
{
((uint16*)TextInputDescriptionArgs)[0] = 0;
((uint16*)TextInputDescriptionArgs)[1] = 64;
window_text_input_open(w, WIDX_PREVIEW, 5128, 5129, STR_NONE, STR_NONE, 3);
}

8
src/windows/map.c
View File

@@ -438,12 +438,16 @@ static void window_map_textinput()
static void window_map_inputsize_land(rct_window *w)
{
window_text_input_open(w, WIDX_LAND_TOOL, 5128, 5130, STR_NONE, STR_NONE, 3);
((uint16*)TextInputDescriptionArgs)[0] = 1;
((uint16*)TextInputDescriptionArgs)[1] = 64;
window_text_input_open(w, WIDX_LAND_TOOL, 5128, 5129, STR_NONE, STR_NONE, 3);
}
static void window_map_inputsize_map(rct_window *w)
{
window_text_input_open(w, WIDX_MAP_SIZE_SPINNER, 5132, 5133, STR_NONE, STR_NONE, 4);
((uint16*)TextInputDescriptionArgs)[0] = 50;
((uint16*)TextInputDescriptionArgs)[1] = 256;
window_text_input_open(w, WIDX_MAP_SIZE_SPINNER, 5130, 5131, STR_NONE, STR_NONE, 4);
}
/**

2
src/windows/text_input.c
View File

@@ -209,7 +209,7 @@ static void window_text_input_paint(){
int font_height = 0;
gfx_draw_string_centred(dpi, input_text_description, w->x + WW / 2, y, w->colours[1], 0);
gfx_draw_string_centred(dpi, input_text_description, w->x + WW / 2, y, w->colours[1], &TextInputDescriptionArgs);
y += 25;

4
src/windows/water.c
View File

@@ -195,7 +195,9 @@ static void window_water_textinput()
static void window_water_inputsize(rct_window *w)
{
window_text_input_open(w, WIDX_PREVIEW, 5128, 5130, STR_NONE, STR_NONE, 3);
((uint16*)TextInputDescriptionArgs)[0] = 1;
((uint16*)TextInputDescriptionArgs)[1] = 64;
window_text_input_open(w, WIDX_PREVIEW, 5128, 5129, STR_NONE, STR_NONE, 3);
}
/**