miguel.horta/openttd-cmclient
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Adjusting of the code.

Browse Source
This commit is contained in:
chucky-n-ice
2024-06-02 12:57:53 +02:00
parent 472cac5e15
commit 15475d644d
3 changed files with 137 additions and 136 deletions
Download Patch File Download Diff File Expand all files Collapse all files

168
src/citymania/cm_commands_gui.cpp
View File

@@ -158,35 +158,34 @@ enum LoginWindowQueryWidgets {
}; };
enum AdminCompanyButtonsWidgets { enum AdminCompanyButtonsWidgets {
WID_AC_CAPTION, ACB_COMPANY_EMPTY,
WID_C_COMPANY_EMPTY, ACB_COMPANY_LOCK,
WID_C_COMPANY_LOCK, ACB_COMPANY_UNLOCK,
WID_C_COMPANY_UNLOCK, ACB_COMPANY_NEWSTICKET,
WID_C_COMPANY_NEWSTICKET, ACB_COMPANY_NEWSTICKET_COMP,
WID_C_COMPANY_NEWSTICKET_COMP, ACB_COMPANY_RESET,
WID_C_COMPANY_RESET, ACB_COMPANY_RESET_SPEC,
WID_C_COMPANY_RESET_SPEC, ACB_COMPANY_RESET_KICK,
WID_C_COMPANY_RESET_KICK, ACB_COMPANY_KNOWN,
WID_C_COMPANY_KNOWN, ACB_COMPANY_RESET_KNOWN,
WID_C_COMPANY_RESET_KNOWN, ACB_COMPANY_MOVE_PLAYER,
WID_C_COMPANY_MOVE_PLAYER, ACB_RESET_COMPANY_TIMER_120,
WID_C_RESET_COMPANY_TIMER_120, ACB_RESET_COMPANY_TIMER,
WID_C_RESET_COMPANY_TIMER, ACB_RESET_COMPANY_TIMER_CANCEL,
WID_C_RESET_COMPANY_TIMER_CANCEL, ACB_COMPANY_SUSPEND,
WID_C_COMPANY_SUSPEND, ACB_COMPANY_UNSUSPEND,
WID_C_COMPANY_UNSUSPEND, ACB_COMPANY_AWARNING,
WID_C_COMPANY_AWARNING, ACB_COMPANY_JOIN2,
WID_C_COMPANY_JOIN2, ACB_COMPANY_LEAVE,
WID_C_COMPANY_LEAVE, ACB_COMPANY_CANCEL,
WID_C_COMPANY_CANCEL, ACB_COMPANY_CAPTION,
WID_C_COMPANY_CAPTION,
}; };
enum AdminCompanyButtonsQueryWidgets { enum AdminCompanyButtonsQueryWidgets {
WID_CQ_RESET_COMPANY_TIMER, ACBQ_RESET_COMPANY_TIMER,
WID_CQ_COMPANY_NEWSTICKET, ACBQ_COMPANY_NEWSTICKET,
WID_CQ_COMPANY_NEWSTICKET_COMP, ACBQ_COMPANY_NEWSTICKET_COMP,
WID_CQ_COMPANY_MOVE_PLAYER, ACBQ_COMPANY_MOVE_PLAYER,
}; };
enum CommunityName { enum CommunityName {
@@ -217,6 +216,7 @@ bool novahost() {
return _novahost; return _novahost;
} }
/* for company_gui */
bool GetAdmin() { return _admin; } bool GetAdmin() { return _admin; }
// void strtomd5(char * buf, char * bufend, int length){ // void strtomd5(char * buf, char * bufend, int length){
@@ -901,9 +901,9 @@ struct AdminCompanyButtonsWindow : Window {
/* disable not supported buttons for n-ice */ /* disable not supported buttons for n-ice */
if (GetServerItem(COMMUNITY) == "1") { if (GetServerItem(COMMUNITY) == "1") {
this->DisableWidget(WID_C_COMPANY_SUSPEND); this->DisableWidget(ACB_COMPANY_SUSPEND);
this->DisableWidget(WID_C_COMPANY_UNSUSPEND); this->DisableWidget(ACB_COMPANY_UNSUSPEND);
this->DisableWidget(WID_C_COMPANY_AWARNING); this->DisableWidget(ACB_COMPANY_AWARNING);
} }
} }
@@ -923,90 +923,90 @@ struct AdminCompanyButtonsWindow : Window {
} }
virtual void OnClick(Point pt, int widget, int click_count) virtual void OnClick([[maybe_unused]] Point pt, int widget,[[maybe_unused]] int click_count)
{ {
if(!_networking) return; if(!_networking) return;
int _company = this->window_number; int _company = this->window_number;
switch (widget) { switch (widget) {
case WID_C_COMPANY_EMPTY: case ACB_COMPANY_EMPTY:
NetworkClientSendChatToServer(fmt::format("!emptycompany {}",_company)); NetworkClientSendChatToServer(fmt::format("!emptycompany {}",_company));
MarkWholeScreenDirty(); MarkWholeScreenDirty();
break; break;
case WID_C_COMPANY_RESET_KICK: case ACB_COMPANY_RESET_KICK:
ShowQuery(STR_XI_RESET_COMP, STR_XI_RESET_KICK_SURE, this, CWCompanyResetKickCallback); ShowQuery(CM_STR_ACB_RESET_COMP, CM_STR_ACB_RESET_KICK_SURE, this, CWCompanyResetKickCallback);
MarkWholeScreenDirty(); MarkWholeScreenDirty();
break; break;
case WID_C_COMPANY_RESET_SPEC: case ACB_COMPANY_RESET_SPEC:
ShowQuery(STR_XI_RESET_COMP, STR_XI_RESET_SPEC_SURE, this, CWCompanyResetSpecCallback); ShowQuery(CM_STR_ACB_RESET_COMP, CM_STR_ACB_RESET_SPEC_SURE, this, CWCompanyResetSpecCallback);
MarkWholeScreenDirty(); MarkWholeScreenDirty();
break; break;
case WID_C_COMPANY_RESET: case ACB_COMPANY_RESET:
ShowQuery(STR_XI_RESET_COMP, STR_XI_RESET_COMP_SURE, this, CWCompanyResetCallback); ShowQuery(CM_STR_ACB_RESET_COMP, CM_STR_ACB_RESET_COMP_SURE, this, CWCompanyResetCallback);
MarkWholeScreenDirty(); MarkWholeScreenDirty();
break; break;
case WID_C_RESET_COMPANY_TIMER: case ACB_RESET_COMPANY_TIMER:
this->query_widget = WID_CQ_RESET_COMPANY_TIMER; this->query_widget = ACBQ_RESET_COMPANY_TIMER;
SetDParam(0, _company); SetDParam(0, _company);
ShowQueryString(STR_EMPTY, STR_XI_RESET_TIMER_VALUE, 25, this, CS_NUMERAL, QSF_NONE); ShowQueryString(STR_EMPTY, CM_STR_ACB_RESET_TIMER_VALUE, 25, this, CS_NUMERAL, QSF_NONE);
break; break;
case WID_C_RESET_COMPANY_TIMER_120: case ACB_RESET_COMPANY_TIMER_120:
NetworkClientSendChatToServer(fmt::format("!resetcompanytimer {} 120",_company)); NetworkClientSendChatToServer(fmt::format("!resetcompanytimer {} 120",_company));
MarkWholeScreenDirty(); MarkWholeScreenDirty();
break; break;
case WID_C_RESET_COMPANY_TIMER_CANCEL: case ACB_RESET_COMPANY_TIMER_CANCEL:
NetworkClientSendChatToServer(fmt::format("!cancelresetcompany {}",_company)); NetworkClientSendChatToServer(fmt::format("!cancelresetcompany {}",_company));
break; break;
case WID_C_COMPANY_LOCK: case ACB_COMPANY_LOCK:
NetworkClientSendChatToServer(fmt::format("!lockcompany {}",_company)); NetworkClientSendChatToServer(fmt::format("!lockcompany {}",_company));
MarkWholeScreenDirty(); MarkWholeScreenDirty();
break; break;
case WID_C_COMPANY_UNLOCK: case ACB_COMPANY_UNLOCK:
NetworkClientSendChatToServer(fmt::format("!unlockcompany {}",_company)); NetworkClientSendChatToServer(fmt::format("!unlockcompany {}",_company));
MarkWholeScreenDirty(); MarkWholeScreenDirty();
break; break;
case WID_C_COMPANY_KNOWN: case ACB_COMPANY_KNOWN:
NetworkClientSendChatToServer(fmt::format("!known {}",_company)); NetworkClientSendChatToServer(fmt::format("!known {}",_company));
MarkWholeScreenDirty(); MarkWholeScreenDirty();
break; break;
case WID_C_COMPANY_RESET_KNOWN: case ACB_COMPANY_RESET_KNOWN:
NetworkClientSendChatToServer(fmt::format("!resetknown {}",_company)); NetworkClientSendChatToServer(fmt::format("!resetknown {}",_company));
MarkWholeScreenDirty(); MarkWholeScreenDirty();
break; break;
case WID_C_COMPANY_MOVE_PLAYER: case ACB_COMPANY_MOVE_PLAYER:
this->query_widget = WID_CQ_COMPANY_MOVE_PLAYER; this->query_widget = ACBQ_COMPANY_MOVE_PLAYER;
SetDParam(0, _company); SetDParam(0, _company);
ShowQueryString(STR_EMPTY, STR_NETWORK_SERVER_LIST_PLAYER_NAME, 250, this, CS_ALPHANUMERAL, QSF_NONE); ShowQueryString(STR_EMPTY, STR_NETWORK_SERVER_LIST_PLAYER_NAME, 250, this, CS_ALPHANUMERAL, QSF_NONE);
break; break;
case WID_C_COMPANY_NEWSTICKET: case ACB_COMPANY_NEWSTICKET:
this->query_widget = WID_CQ_COMPANY_NEWSTICKET; this->query_widget = ACBQ_COMPANY_NEWSTICKET;
SetDParam(0, _company); SetDParam(0, _company);
ShowQueryString(STR_EMPTY, STR_XI_PLAYER_NEWSTICKET, 250, this, CS_ALPHANUMERAL, QSF_NONE); ShowQueryString(STR_EMPTY, CM_STR_ACB_PLAYER_NEWSTICKET, 250, this, CS_ALPHANUMERAL, QSF_NONE);
break; break;
case WID_C_COMPANY_NEWSTICKET_COMP: case ACB_COMPANY_NEWSTICKET_COMP:
this->query_widget = WID_CQ_COMPANY_NEWSTICKET_COMP; this->query_widget = ACBQ_COMPANY_NEWSTICKET_COMP;
SetDParam(0, _company); SetDParam(0, _company);
ShowQueryString(STR_EMPTY, STR_XI_PLAYER_NEWSTICKET, 250, this, CS_ALPHANUMERAL, QSF_NONE); ShowQueryString(STR_EMPTY, CM_STR_ACB_PLAYER_NEWSTICKET, 250, this, CS_ALPHANUMERAL, QSF_NONE);
break; break;
case WID_C_COMPANY_SUSPEND: case ACB_COMPANY_SUSPEND:
NetworkClientSendChatToServer(fmt::format("!suspend {}",_company)); NetworkClientSendChatToServer(fmt::format("!suspend {}",_company));
MarkWholeScreenDirty(); MarkWholeScreenDirty();
break; break;
case WID_C_COMPANY_UNSUSPEND: case ACB_COMPANY_UNSUSPEND:
NetworkClientSendChatToServer(fmt::format("!unsuspend {}",_company)); NetworkClientSendChatToServer(fmt::format("!unsuspend {}",_company));
MarkWholeScreenDirty(); MarkWholeScreenDirty();
break; break;
case WID_C_COMPANY_AWARNING: case ACB_COMPANY_AWARNING:
NetworkClientSendChatToServer(fmt::format("!awarning {}",_company)); NetworkClientSendChatToServer(fmt::format("!awarning {}",_company));
MarkWholeScreenDirty(); MarkWholeScreenDirty();
break; break;
case WID_C_COMPANY_JOIN2: case ACB_COMPANY_JOIN2:
NetworkClientSendChatToServer(fmt::format("!move #{} {}",_network_own_client_id ,_company)); NetworkClientSendChatToServer(fmt::format("!move #{} {}",_network_own_client_id ,_company));
MarkWholeScreenDirty(); MarkWholeScreenDirty();
break; break;
case WID_C_COMPANY_LEAVE: case ACB_COMPANY_LEAVE:
NetworkClientRequestMove(COMPANY_SPECTATOR); NetworkClientRequestMove(COMPANY_SPECTATOR);
break; break;
case WID_C_COMPANY_CANCEL: case ACB_COMPANY_CANCEL:
this->Close(); this->Close();
break; break;
} }
@@ -1015,7 +1015,7 @@ struct AdminCompanyButtonsWindow : Window {
void SetStringParameters(WidgetID widget) const override void SetStringParameters(WidgetID widget) const override
{ {
switch (widget) { switch (widget) {
case WID_C_COMPANY_CAPTION: case ACB_COMPANY_CAPTION:
SetDParam(0, this->window_number); SetDParam(0, this->window_number);
break; break;
} }
@@ -1027,23 +1027,23 @@ struct AdminCompanyButtonsWindow : Window {
switch (this->query_widget) { switch (this->query_widget) {
default: NOT_REACHED(); default: NOT_REACHED();
case WID_CQ_RESET_COMPANY_TIMER: case ACBQ_RESET_COMPANY_TIMER:
NetworkClientSendChatToServer(fmt::format("!resetcompanytimer {} {}",this->window_number,str)); NetworkClientSendChatToServer(fmt::format("!resetcompanytimer {} {}",this->window_number,str));
MarkWholeScreenDirty(); MarkWholeScreenDirty();
break; break;
case WID_CQ_COMPANY_NEWSTICKET: { case ACBQ_COMPANY_NEWSTICKET: {
std::string buffer = GetString(STR_COMPANY_NAME); std::string buffer = GetString(STR_COMPANY_NAME);
NetworkClientSendChatToServer(fmt::format("!news {}: {}", buffer, str)); NetworkClientSendChatToServer(fmt::format("!news {}: {}", buffer, str));
MarkWholeScreenDirty(); MarkWholeScreenDirty();
break; break;
} }
case WID_CQ_COMPANY_NEWSTICKET_COMP: { case ACBQ_COMPANY_NEWSTICKET_COMP: {
std::string buffer = GetString(STR_COMPANY_NAME); std::string buffer = GetString(STR_COMPANY_NAME);
NetworkClientSendChatToServer(fmt::format("!news {} {}", this->window_number, str)); NetworkClientSendChatToServer(fmt::format("!news {} {}", this->window_number, str));
MarkWholeScreenDirty(); MarkWholeScreenDirty();
break; break;
} }
case WID_CQ_COMPANY_MOVE_PLAYER: { case ACBQ_COMPANY_MOVE_PLAYER: {
NetworkClientSendChatToServer(fmt::format("!move #{} {}",str, this->window_number)); NetworkClientSendChatToServer(fmt::format("!move #{} {}",str, this->window_number));
MarkWholeScreenDirty(); MarkWholeScreenDirty();
break; break;
@@ -1153,34 +1153,34 @@ static const NWidgetPart _nested_admin_window_widgets[] = {
static const NWidgetPart _nested_admin_company_window_widgets[] = { static const NWidgetPart _nested_admin_company_window_widgets[] = {
NWidget(NWID_HORIZONTAL), NWidget(NWID_HORIZONTAL),
NWidget(WWT_CLOSEBOX, COLOUR_GREY), NWidget(WWT_CLOSEBOX, COLOUR_GREY),
NWidget(WWT_CAPTION, COLOUR_RED, WID_C_COMPANY_CAPTION), SetDataTip(STR_XI_COMPANY_ADMIN_CAPTION, 0), NWidget(WWT_CAPTION, COLOUR_RED, ACB_COMPANY_CAPTION), SetDataTip(CM_STR_ACB_COMPANY_ADMIN_CAPTION, 0),
NWidget(WWT_STICKYBOX, COLOUR_GREY), NWidget(WWT_STICKYBOX, COLOUR_GREY),
EndContainer(), EndContainer(),
NWidget(WWT_PANEL, COLOUR_GREY), SetFill(0, 1), NWidget(WWT_PANEL, COLOUR_GREY), SetFill(0, 1),
NWidget(NWID_HORIZONTAL), NWidget(NWID_HORIZONTAL),
NWidget(NWID_SPACER), SetMinimalSize(5, 0), SetFill(1, 0), NWidget(NWID_SPACER), SetMinimalSize(5, 0), SetFill(1, 0),
NWidget(NWID_VERTICAL, NC_EQUALSIZE), SetPIP(5, 3, 5), NWidget(NWID_VERTICAL, NC_EQUALSIZE), SetPIP(5, 3, 5),
NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, WID_C_COMPANY_LOCK), SetMinimalSize(10, 13), SetFill(1, 0), SetDataTip(STR_XI_LOCK, STR_XI_LOCK_TOOLTIP), NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, ACB_COMPANY_LOCK), SetMinimalSize(10, 13), SetFill(1, 0), SetDataTip(CM_STR_ACB_LOCK, CM_STR_ACB_LOCK_TOOLTIP),
NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, WID_C_COMPANY_UNLOCK), SetMinimalSize(10, 13), SetFill(1, 0), SetDataTip(STR_XI_UNLOCK, STR_XI_UNLOCK_TOOLTIP), NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, ACB_COMPANY_UNLOCK), SetMinimalSize(10, 13), SetFill(1, 0), SetDataTip(CM_STR_ACB_UNLOCK, CM_STR_ACB_UNLOCK_TOOLTIP),
NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, WID_C_COMPANY_KNOWN), SetMinimalSize(10, 13), SetFill(1, 0), SetDataTip(STR_XI_KNOWN, STR_XI_KNOWN_TOOLTIP), NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, ACB_COMPANY_KNOWN), SetMinimalSize(10, 13), SetFill(1, 0), SetDataTip(CM_STR_ACB_KNOWN, CM_STR_ACB_KNOWN_TOOLTIP),
NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, WID_C_COMPANY_RESET_KNOWN), SetMinimalSize(10, 13), SetFill(1, 0), SetDataTip(STR_XI_RESET_KNOWN, STR_XI_RESET_KNOWN_TOOLTIP), NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, ACB_COMPANY_RESET_KNOWN), SetMinimalSize(10, 13), SetFill(1, 0), SetDataTip(CM_STR_ACB_RESET_KNOWN, CM_STR_ACB_RESET_KNOWN_TOOLTIP),
NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, WID_C_COMPANY_MOVE_PLAYER), SetMinimalSize(10, 13), SetFill(1, 0), SetDataTip(STR_XI_MOVE_PLAYER_TO, STR_XI_MOVE_PLAYER_TO_TOOLTIP), NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, ACB_COMPANY_MOVE_PLAYER), SetMinimalSize(10, 13), SetFill(1, 0), SetDataTip(CM_STR_ACB_MOVE_PLAYER_TO, CM_STR_ACB_MOVE_PLAYER_TO_TOOLTIP),
NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, WID_C_COMPANY_NEWSTICKET_COMP), SetMinimalSize(10, 13), SetFill(1, 0), SetDataTip(STR_XI_COMPANY_NEWSTICKET_BUTTON_COMP, STR_XI_COMPANY_NEWSTICKET_BUTTON_COMP_TOOLTIP), NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, ACB_COMPANY_NEWSTICKET_COMP), SetMinimalSize(10, 13), SetFill(1, 0), SetDataTip(CM_STR_ACB_COMPANY_NEWSTICKET_BUTTON_COMP, CM_STR_ACB_COMPANY_NEWSTICKET_BUTTON_COMP_TOOLTIP),
NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, WID_C_COMPANY_SUSPEND), SetMinimalSize(10, 13), SetFill(1, 0), SetDataTip(STR_XI_SUSPEND, STR_XI_SUSPEND_TOOLTIP), NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, ACB_COMPANY_SUSPEND), SetMinimalSize(10, 13), SetFill(1, 0), SetDataTip(CM_STR_ACB_SUSPEND, CM_STR_ACB_SUSPEND_TOOLTIP),
NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, WID_C_COMPANY_UNSUSPEND), SetMinimalSize(10, 13), SetFill(1, 0), SetDataTip(STR_XI_UNSUSPEND, STR_XI_UNSUSPEND_TOOLTIP), NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, ACB_COMPANY_UNSUSPEND), SetMinimalSize(10, 13), SetFill(1, 0), SetDataTip(CM_STR_ACB_UNSUSPEND, CM_STR_ACB_UNSUSPEND_TOOLTIP),
NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, WID_C_COMPANY_JOIN2),SetMinimalSize(10, 13), SetFill(1, 0),SetDataTip(STR_XI_COMPANY_JOIN2, STR_XI_COMPANY_JOIN2_TOOLTIP), NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, ACB_COMPANY_JOIN2),SetMinimalSize(10, 13), SetFill(1, 0),SetDataTip(CM_STR_ACB_COMPANY_JOIN2, CM_STR_ACB_COMPANY_JOIN2_TOOLTIP),
EndContainer(), EndContainer(),
NWidget(NWID_SPACER), SetMinimalSize(5, 0), SetFill(1, 0), NWidget(NWID_SPACER), SetMinimalSize(5, 0), SetFill(1, 0),
NWidget(NWID_VERTICAL, NC_EQUALSIZE), SetPIP(5, 3, 5), NWidget(NWID_VERTICAL, NC_EQUALSIZE), SetPIP(5, 3, 5),
NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, WID_C_COMPANY_EMPTY), SetMinimalSize(10, 13), SetFill(1, 0), SetDataTip(STR_XI_EMPTY, STR_XI_EMPTY_TOOLTIP), NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, ACB_COMPANY_EMPTY), SetMinimalSize(10, 13), SetFill(1, 0), SetDataTip(CM_STR_ACB_EMPTY, CM_STR_ACB_EMPTY_TOOLTIP),
NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, WID_C_COMPANY_RESET), SetMinimalSize(10, 13), SetFill(1, 0), SetDataTip(STR_XI_RESET, STR_XI_RESET_TOOLTIP), NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, ACB_COMPANY_RESET), SetMinimalSize(10, 13), SetFill(1, 0), SetDataTip(CM_STR_ACB_RESET, CM_STR_ACB_RESET_TOOLTIP),
NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, WID_C_COMPANY_RESET_SPEC), SetMinimalSize(10, 13), SetFill(1, 0), SetDataTip(STR_XI_RESET_SPEC, STR_XI_RESET_SPEC_TOOLTIP), NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, ACB_COMPANY_RESET_SPEC), SetMinimalSize(10, 13), SetFill(1, 0), SetDataTip(CM_STR_ACB_RESET_SPEC, CM_STR_ACB_RESET_SPEC_TOOLTIP),
NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, WID_C_COMPANY_RESET_KICK), SetMinimalSize(10, 13), SetFill(1, 0), SetDataTip(STR_XI_RESET_KICK, STR_XI_RESET_KICK_TOOLTIP), NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, ACB_COMPANY_RESET_KICK), SetMinimalSize(10, 13), SetFill(1, 0), SetDataTip(CM_STR_ACB_RESET_KICK, CM_STR_ACB_RESET_KICK_TOOLTIP),
NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, WID_C_RESET_COMPANY_TIMER_120), SetMinimalSize(10, 13), SetFill(1, 0), SetDataTip(STR_XI_RESET_TIMER_120, STR_XI_RESET_TIMER_120_TOOLTIP), NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, ACB_RESET_COMPANY_TIMER_120), SetMinimalSize(10, 13), SetFill(1, 0), SetDataTip(CM_STR_ACB_RESET_TIMER_120, CM_STR_ACB_RESET_TIMER_120_TOOLTIP),
NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, WID_C_RESET_COMPANY_TIMER), SetMinimalSize(10, 13), SetFill(1, 0), SetDataTip(STR_XI_RESET_TIMER, STR_XI_RESET_TIMER_TOOLTIP), NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, ACB_RESET_COMPANY_TIMER), SetMinimalSize(10, 13), SetFill(1, 0), SetDataTip(CM_STR_ACB_RESET_TIMER, CM_STR_ACB_RESET_TIMER_TOOLTIP),
NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, WID_C_RESET_COMPANY_TIMER_CANCEL), SetMinimalSize(10, 13), SetFill(1, 0), SetDataTip(STR_XI_RESET_TIMER_CANCEL, STR_XI_RESET_TIMER_CANCEL_TOOLTIP), NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, ACB_RESET_COMPANY_TIMER_CANCEL), SetMinimalSize(10, 13), SetFill(1, 0), SetDataTip(CM_STR_ACB_RESET_TIMER_CANCEL, CM_STR_ACB_RESET_TIMER_CANCEL_TOOLTIP),
NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, WID_C_COMPANY_AWARNING), SetMinimalSize(10, 13), SetFill(1, 0), SetDataTip(STR_XI_AWARNING, STR_XI_AWARNING_TOOLTIP), NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, ACB_COMPANY_AWARNING), SetMinimalSize(10, 13), SetFill(1, 0), SetDataTip(CM_STR_ACB_AWARNING, CM_STR_ACB_AWARNING_TOOLTIP),
NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, WID_C_COMPANY_LEAVE),SetMinimalSize(10, 13), SetFill(1, 0),SetDataTip(STR_NETWORK_COMPANY_LIST_SPECTATE, STR_NETWORK_COMPANY_LIST_SPECTATE), NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, ACB_COMPANY_LEAVE),SetMinimalSize(10, 13), SetFill(1, 0),SetDataTip(STR_NETWORK_COMPANY_LIST_SPECTATE, STR_NETWORK_COMPANY_LIST_SPECTATE),
EndContainer(), EndContainer(),
NWidget(NWID_SPACER), SetMinimalSize(5, 0), SetFill(1, 0), NWidget(NWID_SPACER), SetMinimalSize(5, 0), SetFill(1, 0),
EndContainer(), EndContainer(),

5
src/company_gui.cpp
View File

@@ -2199,7 +2199,7 @@ static constexpr NWidgetPart _nested_company_widgets[] = {
EndContainer(), EndContainer(),
/* Admin company buttons */ /* Admin company buttons */
NWidget(NWID_SELECTION, INVALID_COLOUR, CM_WID_C_SELECT_ADMINBUTTONS), NWidget(NWID_SELECTION, INVALID_COLOUR, CM_WID_C_SELECT_ADMINBUTTONS),
NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, CM_WID_C_ADMINBUTTONS), SetDataTip(STR_XI_COMPANY_ADMIN_BUTTON, STR_XI_COMPANY_ADMIN_BUTTON), NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, CM_WID_C_ADMINBUTTONS), SetDataTip(CM_STR_ACB_COMPANY_ADMIN_BUTTON, CM_STR_ACB_COMPANY_ADMIN_BUTTON),
EndContainer(), EndContainer(),
EndContainer(), EndContainer(),
EndContainer(), EndContainer(),
@@ -2379,8 +2379,9 @@ struct CompanyWindow : Window
size->width += padding.width; size->width += padding.width;
break; break;
/* Admin company buttons */
case CM_WID_C_ADMINBUTTONS: case CM_WID_C_ADMINBUTTONS:
size->width = std::max(size->width, GetStringBoundingBox(STR_XI_COMPANY_ADMIN_BUTTON).width); size->width = std::max(size->width, GetStringBoundingBox(CM_STR_ACB_COMPANY_ADMIN_BUTTON).width);
case WID_C_HAS_PASSWORD: case WID_C_HAS_PASSWORD:
if (_networking) *size = maxdim(*size, GetSpriteSize(SPR_LOCK)); if (_networking) *size = maxdim(*size, GetSpriteSize(SPR_LOCK));

100
src/lang/english.txt
View File

@@ -6318,54 +6318,54 @@ CM_STR_CONFIG_SETTING_TOOLBAR_DROPDOWN_CLOSE :Toolbar dropdow
CM_STR_CONFIG_SETTING_TOOLBAR_DROPDOWN_CLOSE_HELPTEXT :Control whether the main toolbar dropdowns activate their default function when the mouse button is released. If not enabled then the dropdown menu will stay open so a selection can be made. CM_STR_CONFIG_SETTING_TOOLBAR_DROPDOWN_CLOSE_HELPTEXT :Control whether the main toolbar dropdowns activate their default function when the mouse button is released. If not enabled then the dropdown menu will stay open so a selection can be made.
###length VEHICLE_TYPES ###length VEHICLE_TYPES
CM_STR_SHOW_HIDDEN_ENGINES_VEHICLE_TRAIN :{BLACK}Show hidden ({NUM}) CM_STR_SHOW_HIDDEN_ENGINES_VEHICLE_TRAIN :{BLACK}Show hidden ({NUM})
CM_STR_SHOW_HIDDEN_ENGINES_VEHICLE_ROAD_VEHICLE :{BLACK}Show hidden ({NUM}) CM_STR_SHOW_HIDDEN_ENGINES_VEHICLE_ROAD_VEHICLE :{BLACK}Show hidden ({NUM})
CM_STR_SHOW_HIDDEN_ENGINES_VEHICLE_SHIP :{BLACK}Show hidden ({NUM}) CM_STR_SHOW_HIDDEN_ENGINES_VEHICLE_SHIP :{BLACK}Show hidden ({NUM})
CM_STR_SHOW_HIDDEN_ENGINES_VEHICLE_AIRCRAFT :{BLACK}Show hidden ({NUM}) CM_STR_SHOW_HIDDEN_ENGINES_VEHICLE_AIRCRAFT :{BLACK}Show hidden ({NUM})
### Admin Buttons ### ### Admin Company Buttons ###
STR_XI_COMPANY_ADMIN_CAPTION :{WHITE}Admin buttons #{NUM} CM_STR_ACB_COMPANY_ADMIN_CAPTION :{WHITE}Admin buttons #{NUM}
STR_XI_COMPANY_ADMIN_BUTTON :{WHITE}Admin buttons CM_STR_ACB_COMPANY_ADMIN_BUTTON :{WHITE}Admin buttons
STR_XI_LOCK :{BLACK}Lock CM_STR_ACB_LOCK :{BLACK}Lock
STR_XI_LOCK_TOOLTIP :{BLACK}Lock Company. All players on it will be sent to spectators. CM_STR_ACB_LOCK_TOOLTIP :{BLACK}Lock Company. All players on it will be sent to spectators.
STR_XI_UNLOCK :{BLACK}Unlock CM_STR_ACB_UNLOCK :{BLACK}Unlock
STR_XI_UNLOCK_TOOLTIP :{BLACK}Unlock Company making possible player(s) joining it again. CM_STR_ACB_UNLOCK_TOOLTIP :{BLACK}Unlock Company making possible player(s) joining it again.
STR_XI_KNOWN :{BLACK}Known CM_STR_ACB_KNOWN :{BLACK}Known
STR_XI_KNOWN_TOOLTIP :{BLACK}Show the known player(s) of company. CM_STR_ACB_KNOWN_TOOLTIP :{BLACK}Show the known player(s) of company.
STR_XI_RESET_KNOWN :{BLACK}Reset Known CM_STR_ACB_RESET_KNOWN :{BLACK}Reset Known
STR_XI_RESET_KNOWN_TOOLTIP :{BLACK}Reset list of known players of company. CM_STR_ACB_RESET_KNOWN_TOOLTIP :{BLACK}Reset list of known players of company.
STR_XI_MOVE_PLAYER_TO :{BLACK}Move to ... CM_STR_ACB_MOVE_PLAYER_TO :{BLACK}Move to ...
STR_XI_MOVE_PLAYER_TO_TOOLTIP :{BLACK}Move a player (number #.. or name) to company CM_STR_ACB_MOVE_PLAYER_TO_TOOLTIP :{BLACK}Move a player (number #.. or name) to company
STR_XI_COMPANY_NEWSTICKET_BUTTON :{BLACK}News CM_STR_ACB_COMPANY_NEWSTICKET_BUTTON :{BLACK}News
STR_XI_COMPANY_NEWSTICKET_BUTTON_TOOLTIP :{BLACK}Open a Newspapper message directed to Company CM_STR_ACB_COMPANY_NEWSTICKET_BUTTON_TOOLTIP :{BLACK}Open a Newspapper message directed to Company
STR_XI_COMPANY_NEWSTICKET_BUTTON_COMP :{BLACK}News (P. C.) CM_STR_ACB_COMPANY_NEWSTICKET_BUTTON_COMP :{BLACK}News (P. C.)
STR_XI_COMPANY_NEWSTICKET_BUTTON_COMP_TOOLTIP :{BLACK}Open a Newspapper message only showed to Company CM_STR_ACB_COMPANY_NEWSTICKET_BUTTON_COMP_TOOLTIP :{BLACK}Open a Newspapper message only showed to Company
STR_XI_SUSPEND :{BLACK}Suspend CM_STR_ACB_SUSPEND :{BLACK}Suspend
STR_XI_SUSPEND_TOOLTIP :{BLACK}Suspend Company actions keeping player in the company. CM_STR_ACB_SUSPEND_TOOLTIP :{BLACK}Suspend Company actions keeping player in the company.
STR_XI_UNSUSPEND :{BLACK}Unsuspend CM_STR_ACB_UNSUSPEND :{BLACK}Unsuspend
STR_XI_UNSUSPEND_TOOLTIP :{BLACK}Unsuspend Company actions. CM_STR_ACB_UNSUSPEND_TOOLTIP :{BLACK}Unsuspend Company actions.
STR_XI_EMPTY :{BLACK}Empty CM_STR_ACB_EMPTY :{BLACK}Empty
STR_XI_EMPTY_TOOLTIP :{BLACK}Send players in company to Spectators. CM_STR_ACB_EMPTY_TOOLTIP :{BLACK}Send players in company to Spectators.
STR_XI_RESET :{BLACK}Reset CM_STR_ACB_RESET :{BLACK}Reset
STR_XI_RESET_TOOLTIP :{BLACK}Reset the company. The company must be empty. CM_STR_ACB_RESET_TOOLTIP :{BLACK}Reset the company. The company must be empty.
STR_XI_RESET_SPEC :{BLACK}Reset Spec CM_STR_ACB_RESET_SPEC :{BLACK}Reset Spec
STR_XI_RESET_SPEC_TOOLTIP :{BLACK}Reset company and send player(s) to spectators. CM_STR_ACB_RESET_SPEC_TOOLTIP :{BLACK}Reset company and send player(s) to spectators.
STR_XI_RESET_KICK :{BLACK}Reset Kick CM_STR_ACB_RESET_KICK :{BLACK}Reset Kick
STR_XI_RESET_KICK_TOOLTIP :{BLACK}Reset company and Kick out of the game player(s) on it. CM_STR_ACB_RESET_KICK_TOOLTIP :{BLACK}Reset company and Kick out of the game player(s) on it.
STR_XI_RESET_TIMER_120 :{BLACK}Reset T. 2m CM_STR_ACB_RESET_TIMER_120 :{BLACK}Reset T. 2m
STR_XI_RESET_TIMER_120_TOOLTIP :{BLACK}Starts a timer to reset company when after 2 minutes countdown. CM_STR_ACB_RESET_TIMER_120_TOOLTIP :{BLACK}Starts a timer to reset company when after 2 minutes countdown.
STR_XI_RESET_TIMER :{BLACK}Reset T.... CM_STR_ACB_RESET_TIMER :{BLACK}Reset T....
STR_XI_RESET_TIMER_TOOLTIP :{BLACK}Starts a timer to reset company when time expire (time is Admin input). CM_STR_ACB_RESET_TIMER_TOOLTIP :{BLACK}Starts a timer to reset company when time expire (time is Admin input).
STR_XI_RESET_TIMER_VALUE :{BLACK}Time to Reset (seconds): CM_STR_ACB_RESET_TIMER_VALUE :{BLACK}Time to Reset (seconds):
STR_XI_RESET_TIMER_CANCEL :{BLACK}Cancel Reset CM_STR_ACB_RESET_TIMER_CANCEL :{BLACK}Cancel Reset
STR_XI_RESET_TIMER_CANCEL_TOOLTIP :{BLACK}Cancel the Reset timer. CM_STR_ACB_RESET_TIMER_CANCEL_TOOLTIP :{BLACK}Cancel the Reset timer.
STR_XI_AWARNING :{BLACK}Warning CM_STR_ACB_AWARNING :{BLACK}Warning
STR_XI_AWARNING_TOOLTIP :{BLACK}Sends a Warning to company that an admin is trying to contact. CM_STR_ACB_AWARNING_TOOLTIP :{BLACK}Sends a Warning to company that an admin is trying to contact.
STR_XI_RESET_COMP :{BLACK}RESET Company CM_STR_ACB_RESET_COMP :{BLACK}RESET Company
STR_XI_RESET_COMP_SURE :{WHITE}Sure to RESET this company? CM_STR_ACB_RESET_COMP_SURE :{WHITE}Sure to RESET this company?
STR_XI_RESET_SPEC_SURE :{WHITE}Sure to RESET this company, send players to SPECTATORS? CM_STR_ACB_RESET_SPEC_SURE :{WHITE}Sure to RESET this company, send players to SPECTATORS?
STR_XI_RESET_KICK_SURE :{WHITE}Sure to RESET this company, and KICK players on it? CM_STR_ACB_RESET_KICK_SURE :{WHITE}Sure to RESET this company, and KICK players on it?
STR_XI_PLAYER_NEWSTICKET :{BLACK}Type message as newspapper ticket to this Player CM_STR_ACB_PLAYER_NEWSTICKET :{BLACK}Type message as newspapper ticket to this Player
STR_XI_COMPANY_NEWSTICKET :{BLACK}Type message as newspapper ticket to this Company CM_STR_ACB_COMPANY_NEWSTICKET :{BLACK}Type message as newspapper ticket to this Company
STR_XI_COMPANY_JOIN2 :{BLACK}A. Join CM_STR_ACB_COMPANY_JOIN2 :{BLACK}A. Join
STR_XI_COMPANY_JOIN2_TOOLTIP :{BLACK}Join as an admin CM_STR_ACB_COMPANY_JOIN2_TOOLTIP :{BLACK}Join as an admin