cpp/openttd-patchpack/source Changeset - r214:315143c5d296

Changeset - r214:315143c5d296

Parent rev.

Child rev.

[Not reviewed]

master

0 1 0

signde - 20 years ago 2004-09-12 16:03:40
signde@openttd.org

(svn r215) -Feature: direct connect now allows selecting a port and a playername [ip/host]:[port]#[player]

1 file changed with 29 insertions and 3 deletions:

network_gui.c

0 comments (0 inline, 0 general)

network_gui.c

➞

Show inline comments

@@ @@ -127,99 +127,125 @@ static void NetworkGameWindowWndProc(Win @@
+				}
 				if (cur_item == NULL) { return;} // click out of vehicle bounds
 				selected_item = cur_item;
+			}
 		} break;
 		case 16: /* Join Game */
 			if (selected_item != NULL)
 				NetworkCoreConnectGameStruct(selected_item);
 			break;
+		}
 		break;
 	case WE_DROPDOWN_SELECT: /* we have selected a dropdown item in the list */
 		_network_connection = e->dropdown.index;
 		switch (_network_connection) {
 		case 0: /* LAN */
 			NetworkGameListFromLAN();
 			break;
 		case 1: /* Internet */
 			NetworkGameListFromInternet();
 			break;
+		}
 		_network_game_count_last = _network_game_count;
 		SetWindowDirty(w);
 		break;
 	case WE_MOUSELOOP:
 		if (_selected_field == 6)
 			HandleEditBox(w, 6);
 		break;
 	case WE_KEYPRESS:
 		if (_selected_field != 6)
 			break;
 		switch (HandleEditBoxKey(w, 6, e)) {
 		case 1:
 			HandleButtonClick(w, 9);
 			break;
+		}
 		break;
 	case WE_ON_EDIT_TEXT: {
 		const byte *b = e->edittext.str;
 		if (*b != 0)
 			NetworkCoreConnectGame(b, _network_server_port);
 		byte *b = e->edittext.str;
 		if (*b != 0) {
 			byte * ip = NULL;
 			byte * port = NULL;
 			byte * player = NULL;
 			byte c;
 			uint16 rport;
 			rport = _network_server_port;
 			c = 0;
 			ip = b;
 			while (b[c] != 0) {
 				if (((char)b[c]) == '#') {
 					player = &b[c+1];
 					b[c] = 0;
+					}
 				if (((char)b[c]) == ':') {
 					port = &b[c+1];
 					b[c] = 0;
+					}
 				c++;
+				}
 			if (player!=NULL) _network_playas = atoi(player);
 			if (port!=NULL) rport = atoi(port);
 			NetworkCoreConnectGame(b, rport);
+		}
 	} break;
 	case WE_TICK: {
 		if (_network_game_count_last != _network_game_count)
 			SetWindowDirty(w);
 	} break;
+	}
+}
 static const Widget _network_game_window_widgets[] = {
 {   WWT_CLOSEBOX,   BGC,     0,    10,     0,    13, STR_00C5,										STR_018B_CLOSE_WINDOW},
 {    WWT_CAPTION,   BGC,    10,   399,     0,    13, STR_NETWORK_MULTIPLAYER,			STR_NULL},
 {     WWT_IMGBTN,   BGC,     0,   399,    14,   199, 0x0,													STR_NULL},
 { WWT_PUSHTXTBTN,   BTC,    20,   130,    22,    33, STR_NETWORK_FIND_SERVER,			STR_NETWORK_FIND_SERVER_TIP},
 { WWT_PUSHTXTBTN,   BTC,   145,   255,    22,    33, STR_NETWORK_DIRECT_CONNECT,	STR_NETWORK_DIRECT_CONNECT_TIP},
 { WWT_PUSHTXTBTN,   BTC,   270,   380,    22,    33, STR_NETWORK_START_SERVER,		STR_NETWORK_START_SERVER_TIP},
 {     WWT_IMGBTN,   BGC,   250,   394,    42,    53, 0x0,													STR_NETWORK_ENTER_NAME_TIP},
 {          WWT_6,   BGC,   250,   393,    62,    73, STR_NETWORK_COMBO1,					STR_NETWORK_CONNECTION_TYPE_TIP},
 {   WWT_CLOSEBOX,   BGC,   382,   392,    63,    72, STR_0225,										STR_NETWORK_CONNECTION_TYPE_TIP},
 {  WWT_SCROLLBAR,   BGC,   382,   392,    81,   176, 0x0,													STR_0190_SCROLL_BAR_SCROLLS_LIST},
 {     WWT_IMGBTN,   BTC,    10,   231,    81,    92, 0x0,													STR_NETWORK_GAME_NAME_TIP },
 {     WWT_IMGBTN,   BTC,   232,   281,    81,    92, 0x0,													STR_NETWORK_PLAYERS_TIP },
 {     WWT_IMGBTN,   BTC,   282,   331,    81,    92, 0x0,													STR_NETWORK_MAP_SIZE_TIP },
 {     WWT_IMGBTN,   BTC,   332,   381,    81,    92, 0x0,													STR_NETWORK_INFO_ICONS_TIP },
 {     WWT_MATRIX,   BGC,    10,   381,    93,   176, 0x601,												STR_NETWORK_CLICK_GAME_TO_SELECT},
 { WWT_PUSHTXTBTN,   BTC,   145,   255,   180,   191, STR_012E_CANCEL,							STR_NULL},
 { WWT_PUSHTXTBTN,   BTC,   270,   392,   180,   191, STR_NETWORK_JOIN_GAME,				STR_NULL},
 {   WIDGETS_END},
 };
 static const WindowDesc _network_game_window_desc = {
 	WDP_CENTER, WDP_CENTER, 400, 200,
 	WC_NETWORK_WINDOW,0,
 	WDF_STD_TOOLTIPS | WDF_DEF_WIDGET | WDF_UNCLICK_BUTTONS,
 	_network_game_window_widgets,
 	NetworkGameWindowWndProc,
 };
 void ShowNetworkGameWindow()

0 comments (0 inline, 0 general)