From a71e60bed5073a40e1876450a3fa334d5bf12378 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Janiszewski?= Date: Sat, 30 Jul 2016 20:49:07 +0200 Subject: [PATCH] Make window_start_textbox accept pointer argument --- src/interface/window.c | 2 +- src/interface/window.h | 2 +- src/windows/editor_object_selection.c | 2 +- src/windows/server_list.c | 2 +- src/windows/server_start.c | 6 +++--- src/windows/title_command_editor.c | 6 +++--- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/interface/window.c b/src/interface/window.c index 2fc1a323f7..e5dfb0cb6f 100644 --- a/src/interface/window.c +++ b/src/interface/window.c @@ -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(); diff --git a/src/interface/window.h b/src/interface/window.h index 3b2fe2683d..1372267d61 100644 --- a/src/interface/window.h +++ b/src/interface/window.h @@ -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(); diff --git a/src/windows/editor_object_selection.c b/src/windows/editor_object_selection.c index ef6a0833a2..80e8954c88 100644 --- a/src/windows/editor_object_selection.c +++ b/src/windows/editor_object_selection.c @@ -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)); diff --git a/src/windows/server_list.c b/src/windows/server_list.c index 69dc1c8c09..fb16c361ac 100644 --- a/src/windows/server_list.c +++ b/src/windows/server_list.c @@ -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; diff --git a/src/windows/server_start.c b/src/windows/server_start.c index 4b0f230d11..a72a453d9f 100644 --- a/src/windows/server_start.c +++ b/src/windows/server_start.c @@ -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) { diff --git a/src/windows/title_command_editor.c b/src/windows/title_command_editor.c index 1044279f19..bb93b9b15f 100644 --- a/src/windows/title_command_editor.c +++ b/src/windows/title_command_editor.c @@ -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) {