diff --git a/nova_changelog.txt b/cm_changelog.txt similarity index 89% rename from nova_changelog.txt rename to cm_changelog.txt index f10280a10b..8b643e9002 100644 --- a/nova_changelog.txt +++ b/cm_changelog.txt @@ -1,8 +1,6 @@ -Prepared by Novapolis Team http://www.novapolis.net - == ATTENTION == The client circumvents the OpenTTD version checks to be able to join unpatched multiplayer games. -Because of this, if you encounter any bug, report it to Novapolis team as it may be connected to patches included. +Because of this, if you encounter any bug, report it to CityMania team as it may be connected to patches included. Unless you encouter the same bug on unpatched OpenTTD client do not report it to OpenTTD development team. @@ -11,6 +9,7 @@ If you have shared OpenTTD folder, you can just unzip anywhere and launch If you dont use shared folder, unzip into your OpenTTD folder innerhighlight.grf in data folder is required, copy it to data or content_download/data folder + == PRO INSTALL == WINDOWS Possible situations: @@ -27,24 +26,24 @@ Possible situations: Copy all files except LANG folder and OPENTTD.EXE into User profile folder called OpenTTD This will enable you to use any number or openttd versions/clients under condition you keep openttd.exe and its lang files in one folder (every client comes with binary and lang folder at least) LINUX -Novapolis does not ship linux client. Your only chance is to compile it by yourself. +CityMania does not ship linux client. Your only chance is to compile it by yourself. Process is easy and simple guide is at http://wiki.openttd.org/Compiling_on_(GNU/)Linux_and_*BSD -If you can use Linux, you can compile OpenTTD too + == LOGIN SYSTEM == -Community Login system - login window +Community Login system - login window. Atm accessible only by defining hotkey for it. - Please read carefully about new login system if you intend to use it -- new login system for Novapolis and also for n-ice and BTPro, login date are stored in new config file novapolis.cfg +- new login system for CityMania and also for n-ice and BTPro, login date are stored in new config file novapolis.cfg - login window can be opened via landinfo dropdown mene or a hotkey can be associated with it, for example CTRL+L - login is saved by entering text via OpenTTD forms. Remember that OpenTTD shows real letters when entering any text - - novapolis password is stored encrypted and login string is sent via ingame chat privately to server + - TODO novapolis password is stored encrypted and login string is sent via ingame chat privately to server so no one can see it - n-ice and BTPro uses token system. In order to retrieve the token, client has to log to their websites obtain the token here and enter it in ingame chat Alternatively both communities implemented a system, that one can open a dedicated webpage and enter username and password there to obtain the token, which is used in n-ice and BTPro - patched OpenTTD client and Novapolis client uses it too. + patched OpenTTD client and CityMania client uses it too. Once token is retrieved, it is sent via ingame chat privately to server so no one can see it @@ -52,23 +51,31 @@ Community Login system - login window is stored in novapolis.cfg file and send decrypted via OpenTTD to their website Thus do not provide novapolis.cfg file to any one! N-ice and BTPro are 3rd side and Novapolis cannot guarantee safety of the login to their community - and should they change the login system, Novapolis client login will not work for both of them + and should they change the login system, CityMania client login will not work for both of them + == SCRIPTS == -autoexec.scr contains some predefined aliases for connecting on Novapolis server -In game press ~ (above tab key) and write "nova+", e.g. "nova1". This will connect you to desired server +autoexec.scr contains some predefined aliases for connecting on CityMania server +In game press ~ (above tab key) and write "cm", e.g. "cm1". This will connect you to desired server This is usable for any OpenTTD servers -If you want to use login alias, you will have to rewrite "nick" and "password" to your actual Novapolis account. +If you want to use login alias, you will have to rewrite "nick" and "password" to your actual CityMania account. However bear in mind, if you accidentally launch this alias on another server, you will uncover your password == OPENTTD.CFG == -In openttd.cfg.example are lines you can add to your openttd.cfg to have Novapolis servers available in multiplayer menu all the time without searching for games +In openttd.cfg.example are lines you can add to your openttd.cfg to have CityMania servers available in multiplayer menu all the time without searching for games This is usable for any OpenTTD servers == CHANGELOG == +*** v28-151 TODO date*** +- Renamed to CityMania client as successor of Novapolis, all community-related things changed accordingly. +- TODO Ship full openttd version, not just patch that requires original ttd +- Providing complete source pack instead of just diff +- Show houses count in town gui, town can be sorted by it too. +- TODO 1.5.1 cb changes + *** v27-150 *** - Land info tool works as tooltip, can also be used to mesure distances by dragging - land_info hotkey (no default) diff --git a/novattd.sublime-project b/cmclient.sublime-project similarity index 100% rename from novattd.sublime-project rename to cmclient.sublime-project diff --git a/release.sh b/release.sh index 52203977de..66b51cf986 100755 --- a/release.sh +++ b/release.sh @@ -1,4 +1,4 @@ -TMP="/tmp/nova_release" +TMP="/tmp/cmclient_release" WIN="/var/run/media/pavels/F8040EC2040E843A/novattd" rm -rf $TMP echo $TMP @@ -7,13 +7,14 @@ unzip -d $TMP release.zip cp -r $WIN/bin/lang $TMP cp nova_changelog.txt $TMP/changelog.txt rm $TMP/nova*.diff -cp nova150.diff $TMP +rm $TMP/citymania*.diff +cp citymania151.diff $TMP DIR=`pwd` pushd $TMP cp $WIN/bin/openttd.exe openttd.exe rm $DIR/novapolis_client.zip -zip -9 -r $DIR/novapolis_client.zip * +zip -9 -r $DIR/citymania_openttd.zip * cp $WIN/bin/openttd64.exe openttd.exe rm $DIR/novapolis_client_64.zip -zip -9 -r $DIR/novapolis_client_64.zip * +zip -9 -r $DIR/citymania_openttd_64.zip * popd \ No newline at end of file diff --git a/src/commands_gui.cpp b/src/commands_gui.cpp index c3c4ed9120..07ef01bc8b 100644 --- a/src/commands_gui.cpp +++ b/src/commands_gui.cpp @@ -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), diff --git a/src/lang/english.txt b/src/lang/english.txt index dc30d62ff1..1ece874d5d 100644 --- a/src/lang/english.txt +++ b/src/lang/english.txt @@ -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 diff --git a/src/network/network_gui.cpp b/src/network/network_gui.cpp index e3502cfc7b..9d6bd8dd7b 100644 --- a/src/network/network_gui.cpp +++ b/src/network/network_gui.cpp @@ -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), diff --git a/src/widgets/network_widget.h b/src/widgets/network_widget.h index 8b0831bafb..348f90441b 100644 --- a/src/widgets/network_widget.h +++ b/src/widgets/network_widget.h @@ -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