0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

change the campaignserver default port to 15005...

Browse source 
...to separate the 1.4.x compatible stuff from all older stuff

this is the campaignserver to be used for 1.4.x, too
This commit is contained in:
Nils Kneuper 2008-01-13 13:22:40 +00:00
parent 9ab3d191eb
commit a8bd3845ef
5 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
changelog
View file

@ -91,6 +91,8 @@ Version 1.3.14:
* fullscreen now defaults to false
* "hide_help" now hides the unit from the list in help, but still allow to
see its description (using context-menu or hotkey)
* change the default port for the campaign server to 15005 to seperate the
new 1.4.x way from the old possibly broken content from the trunk server
Version 1.3.13:
* campaigns:

2
data/tools/wesnoth/campaignserver_client.py
View file

@ -3,7 +3,7 @@ import wesnoth.wmldata as wmldata
class CampaignClient:
# First port listed will be used as default.
portmap = (("15003", "1.3.x"), ("15004", "1.2.x"))
portmap = (("15003", "1.3.x"), ("15004", "1.2.x"), ("15005", "1.4.x"))
def __init__(self, address = None):
"""

10
data/tools/wesnoth/wescamp.py
View file

@ -49,7 +49,7 @@ if __name__ == "__main__":
"""Download an addon from the server.
server The url of the addon server eg
campaigns.wesnoth.org:15003.
campaigns.wesnoth.org:15005.
addon The name of the addon.
path Directory to unpack the campaign in.
returns Nothing.
@ -66,7 +66,7 @@ if __name__ == "__main__":
"""Get a list of addons on the server.
server The url of the addon server eg
campaigns.wesnoth.org:15003.
campaigns.wesnoth.org:15005.
translatable_only If True only returns translatable addons.
returns A dictonary with the addon as key and the translatable
status as value.
@ -98,7 +98,7 @@ if __name__ == "__main__":
"""Get the timestamp of a campaign on the server.
server The url of the addon server eg
campaigns.wesnoth.org:15003.
campaigns.wesnoth.org:15005.
addon The name of the addon.
returns The timestamp of the campaign, -1 if not on the server.
"""
@ -124,7 +124,7 @@ if __name__ == "__main__":
"""Upload a addon from the server to wescamp.
server The url of the addon server eg
campaigns.wesnoth.org:15003.
campaigns.wesnoth.org:15005.
addon The name of the addon.
temp_dir The directory where the unpacked campaign can be stored.
svn_dir The directory containing a checkout of wescamp.
@ -180,7 +180,7 @@ if __name__ == "__main__":
"""Update the translations from wescamp to the server.
server The url of the addon server eg
campaigns.wesnoth.org:15003.
campaigns.wesnoth.org:15005.
addon The name of the addon.
temp_dir The directory where the unpacked campaign can be stored.
svn_dir The directory containing a checkout of wescamp.

2
src/campaign_server/campaign_server.cpp
View file

@ -121,7 +121,7 @@ namespace {
{
scoped_istream stream = istream_file(file_);
read(cfg_, *stream);
return lexical_cast_default<int>(cfg_["port"], 15003);
return lexical_cast_default<int>(cfg_["port"], 15005);
}
campaign_server::campaign_server(const std::string& cfgfile,size_t min_thread,size_t max_thread)

2
src/game.cpp
View file

@ -1113,7 +1113,7 @@ void game_controller::download_campaigns(std::string host)
try {
const network::manager net_manager;
const network::connection sock = dialogs::network_connect_dialog(disp(), _("Connecting to Server..."),
items.front(), lexical_cast_default<int>(items.back(),15003) );
items.front(), lexical_cast_default<int>(items.back(),15005) );
if(!sock) {
gui::show_error_message(disp(), _("Could not connect to host."));
preferences::set_campaign_server("");