mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Make window_start_textbox accept pointer argument

This commit is contained in:
Michał Janiszewski 2016-07-30 20:49:07 +02:00
parent a40b3c63af
commit a71e60bed5
6 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/interface/window.c
View File

@ -2508,7 +2508,7 @@ void textinput_cancel()
}
}
void window_start_textbox(rct_window *call_w, int call_widget, rct_string_id existing_text, uint32 existing_args, int maxLength)
void window_start_textbox(rct_window *call_w, int call_widget, rct_string_id existing_text, char * existing_args, int maxLength)
{
if (gUsingWidgetTextBox)
window_cancel_textbox();

2
src/interface/window.h
View File

@ -748,7 +748,7 @@ void textinput_cancel();
void window_move_and_snap(rct_window *w, int newWindowX, int newWindowY, int snapProximity);
int window_can_resize(rct_window *w);
void window_start_textbox(rct_window *call_w, int call_widget, rct_string_id existing_text, uint32 existing_args, int maxLength);
void window_start_textbox(rct_window *call_w, int call_widget, rct_string_id existing_text, char *existing_args, int maxLength);
void window_cancel_textbox();
void window_update_textbox_caret();
void window_update_textbox();

2
src/windows/editor_object_selection.c
View File

@ -846,7 +846,7 @@ static void window_editor_object_selection_mouseup(rct_window *w, int widgetInde
break;
case WIDX_FILTER_STRING_BUTTON:
//window_text_input_open(w, widgetIndex, STR_OBJECT_SEARCH, STR_OBJECT_SEARCH_DESC, STR_STRING, (uint32)_filter_string, 40);
window_start_textbox(w, widgetIndex, STR_STRING, (uint32)_filter_string, 40);
window_start_textbox(w, widgetIndex, STR_STRING, _filter_string, 40);
break;
case WIDX_FILTER_CLEAR_BUTTON:
memset(_filter_string, 0, sizeof(_filter_string));

2
src/windows/server_list.c
View File

@ -210,7 +210,7 @@ static void window_server_list_mouseup(rct_window *w, int widgetIndex)
window_close(w);
break;
case WIDX_PLAYER_NAME_INPUT:
window_start_textbox(w, widgetIndex, STR_STRING, (uint32)_playerName, 63);
window_start_textbox(w, widgetIndex, STR_STRING, _playerName, 63);
break;
case WIDX_LIST:{
int serverIndex = w->selected_list_item;

6
src/windows/server_start.c
View File

@ -173,13 +173,13 @@ static void window_server_start_mouseup(rct_window *w, int widgetIndex)
window_close(w);
break;
case WIDX_PORT_INPUT:
window_start_textbox(w, widgetIndex, STR_STRING, (uint32)_port, 6);
window_start_textbox(w, widgetIndex, STR_STRING, _port, 6);
break;
case WIDX_NAME_INPUT:
window_start_textbox(w, widgetIndex, STR_STRING, (uint32)_name, 64);
window_start_textbox(w, widgetIndex, STR_STRING, _name, 64);
break;
case WIDX_PASSWORD_INPUT:
window_start_textbox(w, widgetIndex, STR_STRING, (uint32)_password, 32);
window_start_textbox(w, widgetIndex, STR_STRING, _password, 32);
break;
case WIDX_MAXPLAYERS_INCREASE:
if (gConfigNetwork.maxplayers < 255) {

6
src/windows/title_command_editor.c
View File

@ -258,13 +258,13 @@ static void window_title_command_editor_mouseup(rct_window *w, int widgetIndex)
window_close(w);
break;
case WIDX_TEXTBOX_FULL:
window_start_textbox(w, widgetIndex, STR_STRING, (uint32)textbox1Buffer, 4);
window_start_textbox(w, widgetIndex, STR_STRING, textbox1Buffer, 4);
break;
case WIDX_TEXTBOX_X:
window_start_textbox(w, widgetIndex, STR_STRING, (uint32)textbox1Buffer, 4);
window_start_textbox(w, widgetIndex, STR_STRING, textbox1Buffer, 4);
break;
case WIDX_TEXTBOX_Y:
window_start_textbox(w, widgetIndex, STR_STRING, (uint32)textbox2Buffer, 4);
window_start_textbox(w, widgetIndex, STR_STRING, textbox2Buffer, 4);
break;
case WIDX_GET:
if (command.command == TITLE_SCRIPT_LOCATION) {