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

latest novapolis client for 1.5

Browse Source 
--HG--
branch : novattd150
This commit is contained in:
Pavel Stupnikov
2015-03-16 03:20:50 +03:00
parent d201932121
commit e48d2d58e0
69 changed files with 3756 additions and 486 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/company_gui.cpp
+68
View File
@@ -1917,6 +1917,9 @@ static const NWidgetPart _nested_company_widgets[] = {
NWidget(WWT_TEXTBTN, COLOUR_GREY, WID_C_RELOCATE_HQ), SetFill(1, 0), SetDataTip(STR_COMPANY_VIEW_RELOCATE_HQ, STR_COMPANY_VIEW_RELOCATE_COMPANY_HEADQUARTERS),
NWidget(NWID_SPACER), SetMinimalSize(90, 0),
EndContainer(),
NWidget(WWT_TEXTBTN, COLOUR_GREY, CW_WIDGET_COMPANY_RESET), SetFill(1, 0), SetDataTip(STR_XI_RESET2, STR_XI_RESET),
NWidget(WWT_TEXTBTN, COLOUR_GREY, CW_WIDGET_COMPANY_SUSPEND), SetFill(1, 0), SetDataTip(STR_XI_SUSPEND2, STR_XI_SUSPEND),
NWidget(WWT_TEXTBTN, COLOUR_GREY, CW_WIDGET_COMPANY_RESUME), SetFill(1, 0), SetDataTip(STR_XI_RESUME2, STR_XI_RESUME),
NWidget(NWID_SPACER), SetFill(0, 1),
EndContainer(),
EndContainer(),
@@ -1950,6 +1953,7 @@ static const NWidgetPart _nested_company_widgets[] = {
NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, WID_C_COMPANY_PASSWORD), SetFill(1, 0), SetDataTip(STR_COMPANY_VIEW_PASSWORD, STR_COMPANY_VIEW_PASSWORD_TOOLTIP),
NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, WID_C_COMPANY_JOIN), SetFill(1, 0), SetDataTip(STR_COMPANY_VIEW_JOIN, STR_COMPANY_VIEW_JOIN_TOOLTIP),
EndContainer(),
NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, CW_WIDGET_COMPANY_JOIN2), SetFill(1, 0), SetDataTip(STR_COMPANY_VIEW_JOIN, STR_COMPANY_VIEW_JOIN_TOOLTIP),
EndContainer(),
EndContainer(),
EndContainer(),
@@ -1987,6 +1991,16 @@ static const StringID _company_view_vehicle_count_strings[] = {
/**
* Window with general information about a company
*/
static void ResetCallback(Window *w, bool confirmed)
{
if (confirmed) {
CompanyID company2 = (CompanyID)w->window_number;
char msg[128];
seprintf(msg, lastof(msg), "!reset %i", company2 + 1);
NetworkClientSendChatToServer(msg);
}
}
struct CompanyWindow : Window
{
CompanyWidgets query_widget;
@@ -2083,6 +2097,13 @@ struct CompanyWindow : Window
}
}
if(!_networking){
this->SetWidgetDisabledState(CW_WIDGET_COMPANY_RESUME, true);
this->SetWidgetDisabledState(CW_WIDGET_COMPANY_SUSPEND, true);
this->SetWidgetDisabledState(CW_WIDGET_COMPANY_RESET, true);
this->SetWidgetDisabledState(CW_WIDGET_COMPANY_JOIN2, true);
}
this->DrawWidgets();
}
@@ -2139,6 +2160,15 @@ struct CompanyWindow : Window
break;
}
case CW_WIDGET_COMPANY_RESUME:
case CW_WIDGET_COMPANY_SUSPEND:
case CW_WIDGET_COMPANY_RESET:
case CW_WIDGET_COMPANY_JOIN2:
if(!_networking || !_novarole){
size->width = 0;
size->height = 0;
}
break;
#ifdef ENABLE_NETWORK
case WID_C_HAS_PASSWORD:
*size = maxdim(*size, GetSpriteSize(SPR_LOCK));
@@ -2365,6 +2395,44 @@ struct CompanyWindow : Window
/* just send the join command */
NetworkClientRequestMove(company);
}
MarkWholeScreenDirty();
break;
}
case CW_WIDGET_COMPANY_JOIN2:{
CompanyID company2 = (CompanyID)this->window_number;
this->query_widget = CW_WIDGET_COMPANY_JOIN2;
char msg[128];
seprintf(msg, lastof(msg), "!move %i", company2 + 1);
NetworkClientSendChatToServer(msg);
MarkWholeScreenDirty();
break;
}
case CW_WIDGET_COMPANY_RESET:{
if (!_networking) return;
this->query_widget = CW_WIDGET_COMPANY_RESET;
ShowQuery(STR_XI_RESET_CAPTION, STR_XI_REALY_RESET, this, ResetCallback);
MarkWholeScreenDirty();
break;
}
case CW_WIDGET_COMPANY_SUSPEND:{
if (!_networking) return;
this->query_widget = CW_WIDGET_COMPANY_SUSPEND;
CompanyID company2 = (CompanyID)this->window_number;
char msg[128];
seprintf(msg, lastof(msg), "!lockp %i", company2 + 1);
NetworkClientSendChatToServer(msg);
MarkWholeScreenDirty();
break;
}
case CW_WIDGET_COMPANY_RESUME:{
if (!_networking) return;
this->query_widget = CW_WIDGET_COMPANY_RESUME;
CompanyID company2 = (CompanyID)this->window_number;
char msg[128];
seprintf(msg, lastof(msg), "!lockp %i", company2 + 1);
NetworkClientSendChatToServer(msg);
MarkWholeScreenDirty();
break;
}
#endif /* ENABLE_NETWORK */