From 9cca74ce6668566d555ee0a6d4ca30ff4d59600e Mon Sep 17 00:00:00 2001 From: Couls Date: Mon, 15 Jul 2019 17:37:01 -0400 Subject: [PATCH 1/3] change preload_rsc value to set before resources are sent and not after --- code/modules/client/client procs.dm | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/code/modules/client/client procs.dm b/code/modules/client/client procs.dm index 4e59dc2c1cf..3d5f8fc1b95 100644 --- a/code/modules/client/client procs.dm +++ b/code/modules/client/client procs.dm @@ -307,11 +307,6 @@ qdel(src) return - // Change the way they should download resources. - if(config.resource_urls) - preload_rsc = pick(config.resource_urls) - else preload_rsc = 1 // If config.resource_urls is not set, preload like normal. - to_chat(src, "If the title screen is black, resources are still downloading. Please be patient until the title screen appears.") @@ -755,6 +750,10 @@ //Send resources to the client. /client/proc/send_resources() + // Change the way they should download resources. + if(config.resource_urls) + preload_rsc = pick(config.resource_urls) + else preload_rsc = 1 // If config.resource_urls is not set, preload like normal. // Most assets are now handled through global_cache.dm getFiles( 'html/search.js', // Used in various non-NanoUI HTML windows for search functionality From fbd5509590ace5dfa033b2f350128fd29497111c Mon Sep 17 00:00:00 2001 From: Couls Date: Mon, 15 Jul 2019 21:52:57 -0400 Subject: [PATCH 2/3] update preload_rsc's definition --- code/modules/client/client defines.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/client/client defines.dm b/code/modules/client/client defines.dm index fd89434331e..22325fed75f 100644 --- a/code/modules/client/client defines.dm +++ b/code/modules/client/client defines.dm @@ -60,7 +60,7 @@ var/list/related_accounts_ip = list() //So admins know why it isn't working - Used to determine what other accounts previously logged in from this ip var/list/related_accounts_cid = list() //So admins know why it isn't working - Used to determine what other accounts previously logged in from this computer id - preload_rsc = 1 // 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. + 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. var/global/obj/screen/click_catcher/void From 6790d65da42cf74669e0ec155d7399ab7e311293 Mon Sep 17 00:00:00 2001 From: Couls Date: Sun, 11 Aug 2019 16:48:54 -0400 Subject: [PATCH 3/3] review fix --- code/modules/client/client procs.dm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/code/modules/client/client procs.dm b/code/modules/client/client procs.dm index 3d5f8fc1b95..84e86b0f4d3 100644 --- a/code/modules/client/client procs.dm +++ b/code/modules/client/client procs.dm @@ -753,7 +753,8 @@ // Change the way they should download resources. if(config.resource_urls) preload_rsc = pick(config.resource_urls) - else preload_rsc = 1 // If config.resource_urls is not set, preload like normal. + else + preload_rsc = 1 // If config.resource_urls is not set, preload like normal. // Most assets are now handled through global_cache.dm getFiles( 'html/search.js', // Used in various non-NanoUI HTML windows for search functionality