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

fix returning of text fields in twitch window

This commit is contained in:
IntelOrca 2015-06-02 16:11:17 +01:00
parent 48711988c5
commit b4d88e9d92
3 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/interface/window.h
View File

@ -447,6 +447,9 @@ extern rct_window* g_window_list;
// rct2: 0x00F635EE
extern ride_list_item _window_track_list_item;
extern char multi_text_input[512];
extern char multi_text_input2[512];
void window_dispatch_update_all();
void window_update_all();
rct_window *window_create(int x, int y, int width, int height, uint32 *event_handlers, rct_windowclass cls, uint16 flags);

6
src/windows/multi_text_input.c
View File

@ -296,7 +296,7 @@ static void window_multi_text_input_mouseup(){
// Pass back the text that has been entered.
// ecx when zero means text input failed
if (calling_w != NULL)
window_event_textinput_call(calling_w, multi_calling_widget, NULL, NULL);
window_event_textinput_call(calling_w, multi_calling_widget, NULL);
window_close(w);
break;
case WIDX_OKAY:
@ -304,7 +304,7 @@ static void window_multi_text_input_mouseup(){
// Pass back the text that has been entered.
// ecx when none zero means text input success
if (calling_w != NULL)
window_event_textinput_call(calling_w, multi_calling_widget, multi_text_input, multi_text_input2);
window_event_textinput_call(calling_w, multi_calling_widget, multi_text_input);
window_close(w);
break;
case WIDX_USERNAME:
@ -497,7 +497,7 @@ static void window_multi_text_input_text(int key, rct_window* w){
// Pass back the text that has been entered.
// ecx when none zero means text input success
if (calling_w)
window_event_textinput_call(calling_w, multi_calling_widget, multi_text_input, multi_text_input2);
window_event_textinput_call(calling_w, multi_calling_widget, multi_text_input);
}
}

11
src/windows/twitch.c
View File

@ -159,19 +159,18 @@ static void window_twitch_paint()
static void window_twitch_text_input(){
short widgetIndex;
rct_window *w;
char _cl;
uint8 result;
char* text;
//just a stub
window_textinput_get_registers(w, widgetIndex, result, text);
char *userName = multi_text_input;
char *password = multi_text_input2;
}
static void window_twitch_invalidate()
{
rct_window *w;
int i;
sint32 currentSoundDevice;
//just a stub
window_get_register(w);