From 6af54bfec2ba2d1d3e1d0368c14a96447516384e Mon Sep 17 00:00:00 2001 From: Aronai Sieyes Date: Sun, 1 Mar 2020 14:14:52 -0500 Subject: [PATCH] NanoUI Subsystem Fixes Don't do this, the asset subsystem does this for you --- code/controllers/subsystems/nanoui.dm | 32 +--------------------- code/modules/admin/view_variables/topic.dm | 2 +- code/modules/client/client procs.dm | 1 - 3 files changed, 2 insertions(+), 33 deletions(-) diff --git a/code/controllers/subsystems/nanoui.dm b/code/controllers/subsystems/nanoui.dm index 78f47e8c7b..c916eb2739 100644 --- a/code/controllers/subsystems/nanoui.dm +++ b/code/controllers/subsystems/nanoui.dm @@ -1,41 +1,17 @@ SUBSYSTEM_DEF(nanoui) name = "NanoUI" wait = 5 + flags = SS_NO_INIT // a list of current open /nanoui UIs, grouped by src_object and ui_key var/list/open_uis = list() // a list of current open /nanoui UIs, not grouped, for use in processing var/list/processing_uis = list() - // a list of asset filenames which are to be sent to the client on user logon - var/list/asset_files = list() - -/datum/controller/subsystem/nanoui/Initialize() - var/list/nano_asset_dirs = list(\ - "nano/css/",\ - "nano/images/",\ - "nano/images/status_icons/",\ - "nano/images/modular_computers/",\ - "nano/js/",\ - "nano/templates/"\ - ) - - var/list/filenames = null - for (var/path in nano_asset_dirs) - filenames = flist(path) - for(var/filename in filenames) - if(copytext(filename, length(filename)) != "/") // filenames which end in "/" are actually directories, which we want to ignore - if(fexists(path + filename)) - asset_files[filename] = fcopy_rsc(path + filename) // add this file to asset_files for sending to clients when they connect - .=..() - for(var/i in GLOB.clients) - send_resources(i) /datum/controller/subsystem/nanoui/Recover() if(SSnanoui.open_uis) open_uis |= SSnanoui.open_uis if(SSnanoui.processing_uis) processing_uis |= SSnanoui.processing_uis - if(SSnanoui.asset_files) - asset_files |= SSnanoui.asset_files /datum/controller/subsystem/nanoui/stat_entry() return ..("[processing_uis.len] UIs") @@ -44,9 +20,3 @@ SUBSYSTEM_DEF(nanoui) for(var/thing in processing_uis) var/datum/nanoui/UI = thing UI.process() - -//Sends asset files to a client, called on client/New() -/datum/controller/subsystem/nanoui/proc/send_resources(client) - if(!subsystem_initialized) - return - getFilesSlow(client, asset_files) \ No newline at end of file diff --git a/code/modules/admin/view_variables/topic.dm b/code/modules/admin/view_variables/topic.dm index c2b7132494..20b1e24ae4 100644 --- a/code/modules/admin/view_variables/topic.dm +++ b/code/modules/admin/view_variables/topic.dm @@ -449,7 +449,7 @@ to_chat(usr, "This can only be done on mobs with clients") return - SSnanoui.send_resources(H.client) + H.client.send_resources() to_chat(usr, "Resource files sent") to_chat(H, "Your NanoUI Resource files have been refreshed") diff --git a/code/modules/client/client procs.dm b/code/modules/client/client procs.dm index d09986360d..cb8b70519e 100644 --- a/code/modules/client/client procs.dm +++ b/code/modules/client/client procs.dm @@ -168,7 +168,6 @@ log_client_to_db() send_resources() - SSnanoui.send_resources(src) if(!void) void = new()