equal
deleted
inserted
replaced
422 ShowQueryString( |
422 ShowQueryString( |
423 BindCString(_network_default_ip), |
423 BindCString(_network_default_ip), |
424 STR_NETWORK_ENTER_IP, |
424 STR_NETWORK_ENTER_IP, |
425 31 | 0x1000, // maximum number of characters OR |
425 31 | 0x1000, // maximum number of characters OR |
426 250, // characters up to this width pixels, whichever is satisfied first |
426 250, // characters up to this width pixels, whichever is satisfied first |
427 w->window_class, |
427 w, CS_ALPHANUMERAL); |
428 w->window_number, CS_ALPHANUMERAL); |
|
429 } break; |
428 } break; |
430 case 13: /* Start server */ |
429 case 13: /* Start server */ |
431 ShowNetworkStartServerWindow(); |
430 ShowNetworkStartServerWindow(); |
432 break; |
431 break; |
433 case 16: /* Join Game */ |
432 case 16: /* Join Game */ |
646 case 19: /* Cancel button */ |
645 case 19: /* Cancel button */ |
647 ShowNetworkGameWindow(); |
646 ShowNetworkGameWindow(); |
648 break; |
647 break; |
649 |
648 |
650 case 4: /* Set password button */ |
649 case 4: /* Set password button */ |
651 ShowQueryString(BindCString(_network_server_password), |
650 ShowQueryString(BindCString(_network_server_password), STR_NETWORK_SET_PASSWORD, 20, 250, w, CS_ALPHANUMERAL); |
652 STR_NETWORK_SET_PASSWORD, 20, 250, w->window_class, w->window_number, CS_ALPHANUMERAL); |
|
653 break; |
651 break; |
654 |
652 |
655 case 5: { /* Select map */ |
653 case 5: { /* Select map */ |
656 int y = (e->we.click.pt.y - NSSWND_START) / NSSWND_ROWSIZE; |
654 int y = (e->we.click.pt.y - NSSWND_START) / NSSWND_ROWSIZE; |
657 |
655 |
1379 switch (npt) { |
1377 switch (npt) { |
1380 default: NOT_REACHED(); |
1378 default: NOT_REACHED(); |
1381 case NETWORK_GAME_PASSWORD: caption = STR_NETWORK_NEED_GAME_PASSWORD_CAPTION; break; |
1379 case NETWORK_GAME_PASSWORD: caption = STR_NETWORK_NEED_GAME_PASSWORD_CAPTION; break; |
1382 case NETWORK_COMPANY_PASSWORD: caption = STR_NETWORK_NEED_COMPANY_PASSWORD_CAPTION; break; |
1380 case NETWORK_COMPANY_PASSWORD: caption = STR_NETWORK_NEED_COMPANY_PASSWORD_CAPTION; break; |
1383 } |
1381 } |
1384 ShowQueryString(STR_EMPTY, caption, 20, 180, WC_NETWORK_STATUS_WINDOW, 0, CS_ALPHANUMERAL); |
1382 ShowQueryString(STR_EMPTY, caption, 20, 180, FindWindowById(WC_NETWORK_STATUS_WINDOW, 0), CS_ALPHANUMERAL); |
1385 } |
1383 } |
1386 |
1384 |
1387 |
1385 |
1388 static void NetworkJoinStatusWindowWndProc(Window *w, WindowEvent *e) |
1386 static void NetworkJoinStatusWindowWndProc(Window *w, WindowEvent *e) |
1389 { |
1387 { |
1419 case WE_CLICK: |
1417 case WE_CLICK: |
1420 switch (e->we.click.widget) { |
1418 switch (e->we.click.widget) { |
1421 case 0: /* Close 'X' */ |
1419 case 0: /* Close 'X' */ |
1422 case 3: /* Disconnect button */ |
1420 case 3: /* Disconnect button */ |
1423 NetworkDisconnect(); |
1421 NetworkDisconnect(); |
1424 DeleteWindowById(WC_NETWORK_STATUS_WINDOW, 0); |
1422 DeleteWindow(w); |
1425 SwitchMode(SM_MENU); |
1423 SwitchMode(SM_MENU); |
1426 ShowNetworkGameWindow(); |
1424 ShowNetworkGameWindow(); |
1427 break; |
1425 break; |
1428 } |
1426 } |
1429 break; |
1427 break; |
1430 |
1428 |
|
1429 /* If the server asks for a password, we need to fill it in */ |
1431 case WE_ON_EDIT_TEXT_CANCEL: |
1430 case WE_ON_EDIT_TEXT_CANCEL: |
1432 NetworkDisconnect(); |
1431 NetworkDisconnect(); |
1433 ShowNetworkGameWindow(); |
1432 ShowNetworkGameWindow(); |
1434 break; |
1433 break; |
1435 |
1434 |
1707 _chat_tab_completion_active = false; |
1706 _chat_tab_completion_active = false; |
1708 |
1707 |
1709 w = AllocateWindowDesc(&_chat_window_desc); |
1708 w = AllocateWindowDesc(&_chat_window_desc); |
1710 |
1709 |
1711 LowerWindowWidget(w, 2); |
1710 LowerWindowWidget(w, 2); |
1712 WP(w,querystr_d).caption = GB(type, 0, 8) | (dest << 8); // Misuse of caption |
1711 WP(w, querystr_d).caption = GB(type, 0, 8) | (dest << 8); // Misuse of caption |
1713 WP(w,querystr_d).wnd_class = WC_MAIN_TOOLBAR; |
1712 WP(w, querystr_d).afilter = CS_ALPHANUMERAL; |
1714 WP(w,querystr_d).wnd_num = 0; |
|
1715 WP(w,querystr_d).afilter = CS_ALPHANUMERAL; |
|
1716 InitializeTextBuffer(&WP(w, querystr_d).text, _edit_str_buf, lengthof(_edit_str_buf), 0); |
1713 InitializeTextBuffer(&WP(w, querystr_d).text, _edit_str_buf, lengthof(_edit_str_buf), 0); |
1717 } |
1714 } |
1718 |
1715 |
1719 #endif /* ENABLE_NETWORK */ |
1716 #endif /* ENABLE_NETWORK */ |