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

first wave of renaming community to CityMania

Browse Source
This commit is contained in:
Pavel Stupnikov
2015-06-02 03:15:10 +03:00
parent 194d325fa5
commit b8c4cdafcc
7 changed files with 37 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/commands_gui.cpp
View File

@@ -149,7 +149,7 @@ enum LoginWindowQueryWidgets {
};
enum CommunityName {
NOVAPOLIS,
CITYMANIA,
NICE,
BTPRO,
};
@@ -599,7 +599,7 @@ private:
void AccountLogin(CommunityName community){
char uri[128];
switch(community){
case NOVAPOLIS:
case CITYMANIA:
seprintf(uri, lastof(uri), "!login %s %s", _inilogindata[NOVAPOLISUSER], _inilogindata[NOVAPOLISPW]);
NetworkClientSendChatToServer(uri);
return;
@@ -704,7 +704,7 @@ struct LoginWindow : Window {
{
switch (widget) {
case LWW_NOVAPOLIS:
if(_novahost && _networking) AccountLogin(NOVAPOLIS);
if(_novahost && _networking) AccountLogin(CITYMANIA);
break;
case LWW_NICE:
if(_networking) AccountLogin(NICE);
@@ -774,7 +774,7 @@ static const NWidgetPart _nested_login_window_widgets[] = {
NWidget(WWT_PUSHTXTBTN, COLOUR_BROWN, LWW_NOVAPOLIS_PW), SetMinimalSize(30, 20), SetFill(1, 0), SetDataTip(STR_LOGIN_PASSWORD_DISPLAY, STR_LOGIN_CHANGE_PASSWORD),
EndContainer(),
NWidget(NWID_SPACER), SetMinimalSize(0, 10),
NWidget(WWT_PUSHTXTBTN, COLOUR_PURPLE, LWW_NOVAPOLIS), SetMinimalSize(100, 30), SetFill(1, 0), SetDataTip(STR_LOGINWINDOW_NOVAPOLIS, STR_LOGIN_SEND_LOGIN_TT),
NWidget(WWT_PUSHTXTBTN, COLOUR_PURPLE, LWW_NOVAPOLIS), SetMinimalSize(100, 30), SetFill(1, 0), SetDataTip(STR_LOGINWINDOW_CITYMANIA, STR_LOGIN_SEND_LOGIN_TT),
NWidget(NWID_SPACER), SetMinimalSize(0, 10),
//n-ice
NWidget(NWID_HORIZONTAL, NC_EQUALSIZE),

6
src/lang/english.txt
View File

@@ -475,7 +475,7 @@ STR_NEWS_MENU_MESSAGE_HISTORY_MENU :Message history
############ range for about menu starts
STR_ABOUT_MENU_LAND_BLOCK_INFO :Land area information
STR_ABOUT_MENU_SEPARATOR :Novapolis
STR_ABOUT_MENU_SEPARATOR :CityMania
STR_ABOUT_MENU_TOGGLE_CONSOLE :Toggle console
STR_ABOUT_MENU_AI_DEBUG :AI/Game script debug
STR_ABOUT_MENU_SCREENSHOT :Screenshot
@@ -5153,7 +5153,7 @@ STR_TOOLBAR_COMMANDS_ME_TOOLTIP :{BLACK}Show you
#login window
STR_LOGINWINDOW_CAPTION :{WHITE}Login Window
STR_LOGINWINDOW_NOVAPOLIS :{BLACK}Novapolis
STR_LOGINWINDOW_CITYMANIA :{BLACK}CityMania
STR_LOGINWINDOW_NICE :{BLACK}N-ice
STR_LOGINWINDOW_BTPRO :{BLACK}BTPro
STR_LOGINERROR_NOCONNECT :{WHITE}Failed to connect
@@ -5190,7 +5190,7 @@ STR_SORT_BY_HOUSES :Houses
STR_ORDER_DIST :{NUM}, {NUM}
#server list
STR_NETWORK_SELECT_NOVA :{BLACK}Novapolis
STR_NETWORK_SELECT_CITYMANIA :{BLACK}CityMania
STR_NETWORK_SELECT_NICE :{BLACK}N-ice
STR_NETWORK_SELECT_BTPRO :{BLACK}BTPro
STR_NETWORK_SELECT_REDDIT :{BLACK}reddit

6
src/network/network_gui.cpp
View File

@@ -790,14 +790,14 @@ public:
case WID_NG_NICE:
case WID_NG_BTPRO:
case WID_NG_REDDIT:
case WID_NG_NOVA:
case WID_NG_CITYMANIA:
if(!UDP_CC_queried){
NetworkUDPQueryMasterServer();
UDP_CC_queried = true;
}
if(widget == WID_NG_NICE) this->filter_editbox.text.Assign("n-ice");
else if(widget == WID_NG_BTPRO) this->filter_editbox.text.Assign("BTPro");
else if(widget == WID_NG_NOVA) this->filter_editbox.text.Assign("Novapolis");
else if(widget == WID_NG_CITYMANIA) this->filter_editbox.text.Assign("citymania");
else if(widget == WID_NG_REDDIT) this->filter_editbox.text.Assign("reddit");
this->servers.ForceRebuild();
this->BuildGUINetworkGameList();
@@ -968,7 +968,7 @@ static const NWidgetPart _nested_network_game_widgets[] = {
NWidget(WWT_DROPDOWN, COLOUR_LIGHT_BLUE, WID_NG_CONN_BTN),
SetDataTip(STR_BLACK_STRING, STR_NETWORK_SERVER_LIST_ADVERTISED_TOOLTIP),
NWidget(NWID_SPACER), SetFill(1, 0), SetResize(1, 0),
NWidget(WWT_PUSHTXTBTN, COLOUR_WHITE, WID_NG_NOVA), SetFill(1, 0), SetDataTip(STR_NETWORK_SELECT_NOVA, STR_NETWORK_SELECT_SERVER_TOOLTIP),
NWidget(WWT_PUSHTXTBTN, COLOUR_WHITE, WID_NG_CITYMANIA), SetFill(1, 0), SetDataTip(STR_NETWORK_SELECT_CITYMANIA, STR_NETWORK_SELECT_SERVER_TOOLTIP),
NWidget(WWT_PUSHTXTBTN, COLOUR_WHITE, WID_NG_BTPRO), SetFill(1, 0), SetDataTip(STR_NETWORK_SELECT_BTPRO, STR_NETWORK_SELECT_SERVER_TOOLTIP),
NWidget(WWT_PUSHTXTBTN, COLOUR_WHITE, WID_NG_NICE), SetFill(1, 0), SetDataTip(STR_NETWORK_SELECT_NICE, STR_NETWORK_SELECT_SERVER_TOOLTIP),
NWidget(WWT_PUSHTXTBTN, COLOUR_WHITE, WID_NG_REDDIT), SetFill(1, 0), SetDataTip(STR_NETWORK_SELECT_REDDIT, STR_NETWORK_SELECT_SERVER_TOOLTIP),

2
src/widgets/network_widget.h
View File

@@ -52,7 +52,7 @@ enum NetworkGameWidgets {
WID_NG_START, ///< 'Start server' button.
WID_NG_CANCEL, ///< 'Cancel' button.
WID_NG_NOVA, ///< filter nova
WID_NG_CITYMANIA, ///< filter citymania
WID_NG_REDDIT, ///< filter reddit
WID_NG_NICE, ///< filter n-ice
WID_NG_BTPRO, ///< filter btpro