From 588a170c8d9e0c7428fa3252b8a3918e7a0971c8 Mon Sep 17 00:00:00 2001 From: Bjorn Neergaard Date: Thu, 26 Nov 2015 00:31:40 -0500 Subject: [PATCH] Fix NanoUI debug verb --- code/modules/admin/admin_verbs.dm | 2 +- code/modules/admin/verbs/debug.dm | 4 ++-- code/modules/nano/subsystem.dm | 10 +++++++--- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/code/modules/admin/admin_verbs.dm b/code/modules/admin/admin_verbs.dm index 356c1c1f313..b8607431341 100644 --- a/code/modules/admin/admin_verbs.dm +++ b/code/modules/admin/admin_verbs.dm @@ -139,7 +139,7 @@ var/list/admin_verbs_debug = list( /client/proc/reset_latejoin_spawns, /client/proc/create_outfits, /client/proc/debug_huds, - /client/proc/reload_nanoui_templates + /client/proc/reload_nanoui_resources ) var/list/admin_verbs_possess = list( /proc/possess, diff --git a/code/modules/admin/verbs/debug.dm b/code/modules/admin/verbs/debug.dm index 9b42932b12c..764e0754619 100644 --- a/code/modules/admin/verbs/debug.dm +++ b/code/modules/admin/verbs/debug.dm @@ -777,7 +777,7 @@ var/global/list/g_fancy_list_of_types = null if(!holder) return debug_variables(huds[i]) -/client/proc/reload_nanoui_templates() +/client/proc/reload_nanoui_resources() set category = "Debug" set name = "Reload NanoUI Resources" set desc = "Force the client to redownload NanoUI Resources" @@ -785,4 +785,4 @@ var/global/list/g_fancy_list_of_types = null var/list/resources = SSnano.populate_resources() SSnano.close_user_uis(usr) - SSnano.send_resources(src, resources) + SSnano.send_resources(src, resources, force = 1) diff --git a/code/modules/nano/subsystem.dm b/code/modules/nano/subsystem.dm index fbdf1ca5c75..70db2d02b03 100644 --- a/code/modules/nano/subsystem.dm +++ b/code/modules/nano/subsystem.dm @@ -243,7 +243,7 @@ for(var/filename in filenames) if(copytext(filename, length(filename)) != "/") // Ignore directories. if(fexists(path + filename)) - resources.Add(fcopy_rsc(path + filename)) + resources[filename] = fcopy_rsc(path + filename) return resources @@ -257,5 +257,9 @@ * @return nothing */ -/datum/subsystem/nano/proc/send_resources(client, var/list/resources = resource_files) - getFilesSlow(client, resources) \ No newline at end of file +/datum/subsystem/nano/proc/send_resources(client, var/list/resources = resource_files, var/force = 0) + if (force) + for(var/resource in resources) + client << browse_rsc(resource) + else + getFilesSlow(client, resources) \ No newline at end of file