fly/fgdata
1
0
Fork 0
Code Activity

Final part of #450 - dynamic MP server list.

Browse source 
When the dynamic retrieval fails, fall-back to a local list. Note for this to work needed some minor fg+sg tweaks which are also pushed now.
This commit is contained in:
James Turner 2012-12-29 14:39:26 +00:00
parent 68a87991d5
commit 2c87e95bba
1 changed files with 26 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
gui/dialogs/multiplayer.xml
View file

@ -46,8 +46,34 @@
gui.dialog_update("multiplayer", "host"); gui.dialog_update("multiplayer", "host");
} }
var static_serverList = [
['mpserver01.flightgear.org', 'Frankfurt, Germany'],
['mpserver02.flightgear.org', 'Kansas, USA'],
['mpserver03.flightgear.org', 'Germany'],
['mpserver04.flightgear.org', 'United Kingdom'],
['mpserver05.flightgear.org', 'Chicago, USA'],
['mpserver07.flightgear.org', 'Wisconsin, USA'],
['mpserver08.flightgear.org', 'Frankfurt am Main, Germany'],
['mpserver09.flightgear.org', 'Koln, Germany'],
['mpserver10.flightgear.org', 'Montpellier, France'],
['mpserver11.flightgear.org', 'Vilnius, Lithuania'],
['mpserver12.flightgear.org', 'Amsterdam, Netherlands'],
['mpserver13.flightgear.org', 'Grenoble, France']
];
var updateServersFailed = func { var updateServersFailed = func {
debug.dump("Failed to retrieve server list!"); debug.dump("Failed to retrieve server list!");
servers.removeChildren("value");
var i=0;
foreach (var s; static_serverList) {
# create the node the PUI combo
var nm = s[0] ~ " - " ~ s[1];
servers.getNode("value[" ~ i ~ "]", 1).setValue(nm);
i += 1;
}
gui.dialog_update("multiplayer", "host");
} }
# listen for results arriving # listen for results arriving
@ -161,19 +187,6 @@
<editable>false</editable> <editable>false</editable>
<properties>/sim/gui/dialogs/multiplay/servers</properties> <properties>/sim/gui/dialogs/multiplay/servers</properties>
<!--
<value>mpserver01.flightgear.org (Frankfurt, Germany)</value>
<value>mpserver02.flightgear.org (Kansas, USA)</value>
<value>mpserver03.flightgear.org (Germany)</value>
<value>mpserver04.flightgear.org (United Kingdom)</value>
<value>mpserver05.flightgear.org (Chicago, USA)</value>
<value>mpserver07.flightgear.org (Wisconsin, USA)</value>
<value>mpserver08.flightgear.org (Frankfurt am Main, Germany)</value>
<value>mpserver09.flightgear.org (Koln, Germany)</value>
<value>mpserver10.flightgear.org (Montpellier, France)</value>
<value>mpserver11.flightgear.org (Vilnius, Lithuania)</value>
<value>mpserver12.flightgear.org (Amsterdam, Netherlands)</value>
<value>mpserver13.flightgear.org (Grenoble, France)</value> -->
</combo> </combo>
<!-- status area --> <!-- status area -->