|
@@ -155,17 +155,15 @@ public:
|
|
|
|
|
|
int icon_offset = (bottom - top - icon_size.height) / 2;
|
|
|
int text_offset = (bottom - top - FONT_HEIGHT_NORMAL) / 2;
|
|
|
int lock_offset = (bottom - top - lock_size.height) / 2;
|
|
|
|
|
|
DrawCompanyIcon(company, rtl ? right - this->icon_size.width - WD_FRAMERECT_RIGHT : left + WD_FRAMERECT_LEFT, top + icon_offset);
|
|
|
#ifdef ENABLE_NETWORK
|
|
|
if (NetworkCompanyIsPassworded(company)) {
|
|
|
DrawSprite(SPR_LOCK, PAL_NONE, rtl ? left + WD_FRAMERECT_LEFT : right - this->lock_size.width - WD_FRAMERECT_RIGHT, top + lock_offset);
|
|
|
}
|
|
|
#endif
|
|
|
|
|
|
SetDParam(0, company);
|
|
|
SetDParam(1, company);
|
|
|
TextColour col;
|
|
|
if (this->greyed) {
|
|
|
col = (sel ? TC_SILVER : TC_GREY) | TC_NO_SHADE;
|
|
@@ -220,24 +218,22 @@ static const int CTMN_SPECTATOR = -4;
|
|
|
static void PopupMainCompanyToolbMenu(Window *w, int widget, int grey = 0)
|
|
|
{
|
|
|
DropDownList *list = new DropDownList();
|
|
|
|
|
|
switch (widget) {
|
|
|
case WID_TN_COMPANIES:
|
|
|
#ifdef ENABLE_NETWORK
|
|
|
if (!_networking) break;
|
|
|
|
|
|
/* Add the client list button for the companies menu */
|
|
|
*list->Append() = new DropDownListStringItem(STR_NETWORK_COMPANY_LIST_CLIENT_LIST, CTMN_CLIENT_LIST, false);
|
|
|
|
|
|
if (_local_company == COMPANY_SPECTATOR) {
|
|
|
*list->Append() = new DropDownListStringItem(STR_NETWORK_COMPANY_LIST_NEW_COMPANY, CTMN_NEW_COMPANY, NetworkMaxCompaniesReached());
|
|
|
} else {
|
|
|
*list->Append() = new DropDownListStringItem(STR_NETWORK_COMPANY_LIST_SPECTATE, CTMN_SPECTATE, NetworkMaxSpectatorsReached());
|
|
|
}
|
|
|
#endif /* ENABLE_NETWORK */
|
|
|
break;
|
|
|
|
|
|
case WID_TN_STORY:
|
|
|
*list->Append() = new DropDownListStringItem(STR_STORY_BOOK_SPECTATOR, CTMN_SPECTATOR, false);
|
|
|
break;
|
|
|
|
|
@@ -607,13 +603,12 @@ static CallBackFunction ToolbarCompanies
|
|
|
*
|
|
|
* @param index Menu entry to handle.
|
|
|
* @return #CBF_NONE
|
|
|
*/
|
|
|
static CallBackFunction MenuClickCompany(int index)
|
|
|
{
|
|
|
#ifdef ENABLE_NETWORK
|
|
|
if (_networking) {
|
|
|
switch (index) {
|
|
|
case CTMN_CLIENT_LIST:
|
|
|
ShowClientList();
|
|
|
return CBF_NONE;
|
|
|
|
|
@@ -632,13 +627,12 @@ static CallBackFunction MenuClickCompany
|
|
|
} else {
|
|
|
NetworkClientRequestMove(COMPANY_SPECTATOR);
|
|
|
}
|
|
|
return CBF_NONE;
|
|
|
}
|
|
|
}
|
|
|
#endif /* ENABLE_NETWORK */
|
|
|
ShowCompany((CompanyID)index);
|
|
|
return CBF_NONE;
|
|
|
}
|
|
|
|
|
|
/* --- Story button menu --- */
|
|
|
|
|
@@ -2073,15 +2067,13 @@ struct MainToolbarWindow : Window {
|
|
|
case MTHK_ZOOMEDIN_SCREENSHOT: MenuClickLargeWorldScreenshot(SC_ZOOMEDIN); break;
|
|
|
case MTHK_DEFAULTZOOM_SCREENSHOT: MenuClickLargeWorldScreenshot(SC_DEFAULTZOOM); break;
|
|
|
case MTHK_GIANT_SCREENSHOT: MenuClickLargeWorldScreenshot(SC_WORLD); break;
|
|
|
case MTHK_CHEATS: if (!_networking) ShowCheatWindow(); break;
|
|
|
case MTHK_TERRAFORM: ShowTerraformToolbar(); break;
|
|
|
case MTHK_EXTRA_VIEWPORT: ShowExtraViewPortWindowForTileUnderCursor(); break;
|
|
|
#ifdef ENABLE_NETWORK
|
|
|
case MTHK_CLIENT_LIST: if (_networking) ShowClientList(); break;
|
|
|
#endif
|
|
|
case MTHK_SIGN_LIST: ShowSignList(); break;
|
|
|
default: return ES_NOT_HANDLED;
|
|
|
}
|
|
|
return ES_HANDLED;
|
|
|
}
|
|
|
|
|
@@ -2186,15 +2178,13 @@ static Hotkey maintoolbar_hotkeys[] = {
|
|
|
Hotkey(WKC_CTRL | 'P', "zoomedin_screenshot", MTHK_ZOOMEDIN_SCREENSHOT),
|
|
|
Hotkey(WKC_CTRL | 'D', "defaultzoom_screenshot", MTHK_DEFAULTZOOM_SCREENSHOT),
|
|
|
Hotkey((uint16)0, "giant_screenshot", MTHK_GIANT_SCREENSHOT),
|
|
|
Hotkey(WKC_CTRL | WKC_ALT | 'C', "cheats", MTHK_CHEATS),
|
|
|
Hotkey('L', "terraform", MTHK_TERRAFORM),
|
|
|
Hotkey('V', "extra_viewport", MTHK_EXTRA_VIEWPORT),
|
|
|
#ifdef ENABLE_NETWORK
|
|
|
Hotkey((uint16)0, "client_list", MTHK_CLIENT_LIST),
|
|
|
#endif
|
|
|
Hotkey((uint16)0, "sign_list", MTHK_SIGN_LIST),
|
|
|
HOTKEY_LIST_END
|
|
|
};
|
|
|
HotkeyList MainToolbarWindow::hotkeys("maintoolbar", maintoolbar_hotkeys);
|
|
|
|
|
|
static NWidgetBase *MakeMainToolbar(int *biggest_index)
|