|
@@ -655,13 +655,13 @@ public:
|
|
|
} else if (sel->info.use_password) {
|
|
|
DrawString(r.left + WD_FRAMERECT_LEFT, r.right - WD_FRAMERECT_RIGHT, y, STR_NETWORK_SERVER_LIST_PASSWORD, TC_FROMSTRING, SA_CENTER); // password warning
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
|
|
|
virtual void OnClick(Point pt, int widget)
|
|
|
virtual void OnClick(Point pt, int widget, int click_count)
|
|
|
{
|
|
|
this->field = widget;
|
|
|
switch (widget) {
|
|
|
case NGWW_CANCEL: // Cancel button
|
|
|
DeleteWindowById(WC_NETWORK_WINDOW, 0);
|
|
|
break;
|
|
@@ -694,12 +694,15 @@ public:
|
|
|
if (id_v >= this->vscroll.GetCapacity()) return; // click out of bounds
|
|
|
id_v += this->vscroll.GetPosition();
|
|
|
|
|
|
this->server = (id_v < this->servers.Length()) ? this->servers[id_v] : NULL;
|
|
|
this->list_pos = (server == NULL) ? SLP_INVALID : id_v;
|
|
|
this->SetDirty();
|
|
|
|
|
|
/* FIXME the disabling should go into some InvalidateData, which is called instead of the SetDirty */
|
|
|
if (!this->IsWidgetDisabled(NGWW_JOIN)) this->OnClick(pt, NGWW_JOIN, 1);
|
|
|
} break;
|
|
|
|
|
|
case NGWW_LASTJOINED: {
|
|
|
NetworkGameList *last_joined = NetworkGameListAddItem(NetworkAddress(_settings_client.network.last_host, _settings_client.network.last_port));
|
|
|
if (last_joined != NULL) {
|
|
|
this->server = last_joined;
|
|
@@ -710,12 +713,15 @@ public:
|
|
|
this->list_pos = i;
|
|
|
break;
|
|
|
}
|
|
|
}
|
|
|
this->ScrollToSelectedServer();
|
|
|
this->SetDirty();
|
|
|
|
|
|
/* FIXME the disabling should go into some InvalidateData, which is called instead of the SetDirty */
|
|
|
if (!this->IsWidgetDisabled(NGWW_JOIN)) this->OnClick(pt, NGWW_JOIN, 1);
|
|
|
}
|
|
|
} break;
|
|
|
|
|
|
case NGWW_FIND: // Find server automatically
|
|
|
switch (_settings_client.network.lan_internet) {
|
|
|
case 0: NetworkUDPSearchGame(); break;
|
|
@@ -752,20 +758,12 @@ public:
|
|
|
case NGWW_NEWGRF: // NewGRF Settings
|
|
|
if (this->server != NULL) ShowNewGRFSettings(false, false, false, &this->server->info.grfconfig);
|
|
|
break;
|
|
|
}
|
|
|
}
|
|
|
|
|
|
virtual void OnDoubleClick(Point pt, int widget)
|
|
|
{
|
|
|
if (widget == NGWW_MATRIX || widget == NGWW_LASTJOINED) {
|
|
|
/* is the Join button enabled? */
|
|
|
if (!this->IsWidgetDisabled(NGWW_JOIN)) this->OnClick(pt, NGWW_JOIN);
|
|
|
}
|
|
|
}
|
|
|
|
|
|
virtual void OnDropdownSelect(int widget, int index)
|
|
|
{
|
|
|
switch (widget) {
|
|
|
case NGWW_CONN_BTN:
|
|
|
_settings_client.network.lan_internet = index;
|
|
|
break;
|
|
@@ -1154,13 +1152,13 @@ struct NetworkStartServerWindow : public
|
|
|
y += FONT_HEIGHT_NORMAL;
|
|
|
|
|
|
if (y >= this->vscroll.GetCapacity() * FONT_HEIGHT_NORMAL + r.top) break;
|
|
|
}
|
|
|
}
|
|
|
|
|
|
virtual void OnClick(Point pt, int widget)
|
|
|
virtual void OnClick(Point pt, int widget, int click_count)
|
|
|
{
|
|
|
this->field = widget;
|
|
|
switch (widget) {
|
|
|
case NSSW_CANCEL: // Cancel button
|
|
|
ShowNetworkGameWindow();
|
|
|
break;
|
|
@@ -1618,13 +1616,13 @@ struct NetworkLobbyWindow : public Windo
|
|
|
y += FONT_HEIGHT_NORMAL;
|
|
|
|
|
|
SetDParamStr(0, this->company_info[this->company].clients);
|
|
|
DrawString(r.left + WD_FRAMERECT_LEFT, r.right - WD_FRAMERECT_RIGHT, y, STR_NETWORK_GAME_LOBBY_PLAYERS); // players
|
|
|
}
|
|
|
|
|
|
virtual void OnClick(Point pt, int widget)
|
|
|
virtual void OnClick(Point pt, int widget, int click_count)
|
|
|
{
|
|
|
switch (widget) {
|
|
|
case NLWW_CANCEL: // Cancel button
|
|
|
ShowNetworkGameWindow();
|
|
|
break;
|
|
|
|
|
@@ -1633,12 +1631,15 @@ struct NetworkLobbyWindow : public Windo
|
|
|
|
|
|
if (id_v >= this->vscroll.GetCapacity()) break;
|
|
|
|
|
|
id_v += this->vscroll.GetPosition();
|
|
|
this->company = (id_v >= this->server->info.companies_on) ? INVALID_COMPANY : NetworkLobbyFindCompanyIndex(id_v);
|
|
|
this->SetDirty();
|
|
|
|
|
|
/* FIXME the disabling should go into some InvalidateData, which is called instead of the SetDirty */
|
|
|
if (!this->IsWidgetDisabled(NLWW_JOIN)) this->OnClick(pt, NLWW_JOIN, 1);
|
|
|
} break;
|
|
|
|
|
|
case NLWW_JOIN: // Join company
|
|
|
/* Button can be clicked only when it is enabled */
|
|
|
NetworkClientConnectGame(NetworkAddress(_settings_client.network.last_host, _settings_client.network.last_port), this->company);
|
|
|
break;
|
|
@@ -1657,20 +1658,12 @@ struct NetworkLobbyWindow : public Windo
|
|
|
/* Clear the information so removed companies don't remain */
|
|
|
memset(this->company_info, 0, sizeof(this->company_info));
|
|
|
break;
|
|
|
}
|
|
|
}
|
|
|
|
|
|
virtual void OnDoubleClick(Point pt, int widget)
|
|
|
{
|
|
|
if (widget == NLWW_MATRIX) {
|
|
|
/* is the Join button enabled? */
|
|
|
if (!this->IsWidgetDisabled(NLWW_JOIN)) this->OnClick(pt, NLWW_JOIN);
|
|
|
}
|
|
|
}
|
|
|
|
|
|
virtual void OnResize()
|
|
|
{
|
|
|
this->vscroll.SetCapacityFromWidget(this, NLWW_MATRIX);
|
|
|
this->GetWidget<NWidgetCore>(NLWW_MATRIX)->widget_data = (this->vscroll.GetCapacity() << MAT_ROW_START) + (1 << MAT_COL_START);
|
|
|
}
|
|
|
};
|
|
@@ -2082,13 +2075,13 @@ struct NetworkClientListWindow : Window
|
|
|
DrawString(name_left, name_right, y, ci->client_name, colour);
|
|
|
|
|
|
y += FONT_HEIGHT_NORMAL;
|
|
|
}
|
|
|
}
|
|
|
|
|
|
virtual void OnClick(Point pt, int widget)
|
|
|
virtual void OnClick(Point pt, int widget, int click_count)
|
|
|
{
|
|
|
/* Show the popup with option */
|
|
|
if (this->selected_item != -1) {
|
|
|
PopupClientList(this->selected_item, pt.x + this->left, pt.y + this->top);
|
|
|
}
|
|
|
}
|
|
@@ -2215,13 +2208,13 @@ struct NetworkJoinStatusWindow : Window
|
|
|
width = max(width, GetStringBoundingBox(STR_NETWORK_CONNECTING_DOWNLOADING).width);
|
|
|
|
|
|
/* Give a bit more clearing for the widest strings than strictly needed */
|
|
|
size->width = width + WD_FRAMERECT_LEFT + WD_FRAMERECT_BOTTOM + 10;
|
|
|
}
|
|
|
|
|
|
virtual void OnClick(Point pt, int widget)
|
|
|
virtual void OnClick(Point pt, int widget, int click_count)
|
|
|
{
|
|
|
if (widget == NJSW_CANCELOK) { // Disconnect button
|
|
|
NetworkDisconnect();
|
|
|
SwitchToMode(SM_MENU);
|
|
|
ShowNetworkGameWindow();
|
|
|
}
|
|
@@ -2301,13 +2294,13 @@ struct NetworkCompanyPasswordWindow : pu
|
|
|
virtual void OnPaint()
|
|
|
{
|
|
|
this->DrawWidgets();
|
|
|
this->DrawEditBox(NCPWW_PASSWORD);
|
|
|
}
|
|
|
|
|
|
virtual void OnClick(Point pt, int widget)
|
|
|
virtual void OnClick(Point pt, int widget, int click_count)
|
|
|
{
|
|
|
switch (widget) {
|
|
|
case NCPWW_OK:
|
|
|
this->OnOk();
|
|
|
|
|
|
/* FALL THROUGH */
|