Merge pull request #3035 from CIB/feature

New configuration option: external resource download
This commit is contained in:
Chinsky
2013-06-11 12:33:16 -07:00
4 changed files with 19 additions and 1 deletions
+4
View File
@@ -40,6 +40,7 @@
var/Ticklag = 0.9
var/Tickcomp = 0
var/socket_talk = 0 // use socket_talk to communicate with other processes
var/list/resource_urls = null
var/list/mode_names = list()
var/list/modes = list() // allowed modes
@@ -164,6 +165,9 @@
if(type == "config")
switch (name)
if ("resource_urls")
config.resource_urls = stringsplit(value, " ")
if ("admin_legacy_system")
config.admin_legacy_system = 1
+2
View File
@@ -39,3 +39,5 @@
var/player_age = "Requires database" //So admins know why it isn't working - Used to determine how old the account is - in days.
var/related_accounts_ip = "Requires database" //So admins know why it isn't working - Used to determine what other accounts previously logged in from this ip
var/related_accounts_cid = "Requires database" //So admins know why it isn't working - Used to determine what other accounts previously logged in from this computer id
preload_rsc = 0 // This is 0 so we can set it to an URL once the player logs in and have them download the resources from a different server.
+9 -1
View File
@@ -103,6 +103,14 @@
del(src)
return
// Change the way they should download resources.
if(config.resource_urls)
src.preload_rsc = pick(config.resource_urls)
else src.preload_rsc = 1 // If config.resource_urls is not set, preload like normal.
src << "\red If the title screen is black, resources are still downloading. Please be patient until the title screen appears."
clients += src
directory[ckey] = src
@@ -278,4 +286,4 @@
'icons/xenoarch_icons/chart2.jpg',
'icons/xenoarch_icons/chart3.jpg',
'icons/xenoarch_icons/chart4.jpg'
)
)