removes fun - no more spawning in dust clouds :( and i guess faster/more organized overmaps init (#3040)

e
This commit is contained in:
silicons
2021-04-29 04:37:47 -06:00
committed by GitHub
parent bc9f6a34ce
commit 58d131466c
5 changed files with 23 additions and 7 deletions

View File

@@ -107,7 +107,6 @@ var/global/list/runlevel_flags = list(RUNLEVEL_LOBBY, RUNLEVEL_SETUP, RUNLEVEL_G
#define INIT_ORDER_CHEMISTRY 35
#define INIT_ORDER_SKYBOX 30
#define INIT_ORDER_MAPPING 25
#define INIT_ORDER_EVENTS 22 // needed because overmaps is shitcode and not doing this makes init far slower
#define INIT_ORDER_DECALS 20
#define INIT_ORDER_ALARMS 18
#define INIT_ORDER_ATOMS 15
@@ -120,6 +119,8 @@ var/global/list/runlevel_flags = list(RUNLEVEL_LOBBY, RUNLEVEL_SETUP, RUNLEVEL_G
#define INIT_ORDER_ASSETS -4
#define INIT_ORDER_HOLOMAPS -5
#define INIT_ORDER_OVERLAY -6
#define INIT_ORDER_EVENTS -8
#define INIT_ORDER_OVERMAPS -9
#define INIT_ORDER_TICKER -10
#define INIT_ORDER_XENOARCH -20
#define INIT_ORDER_CIRCUIT -21

View File

@@ -20,8 +20,6 @@ SUBSYSTEM_DEF(events)
EVENT_LEVEL_MODERATE = new/datum/event_container/moderate,
EVENT_LEVEL_MAJOR = new/datum/event_container/major
)
if(GLOB.using_map.use_overmap)
GLOB.overmap_event_handler.create_events(GLOB.using_map.overmap_z, GLOB.using_map.overmap_size, GLOB.using_map.overmap_event_areas)
return ..()
/datum/controller/subsystem/events/fire(resumed)

View File

@@ -0,0 +1,19 @@
SUBSYSTEM_DEF(overmaps)
name = "Overmaps"
flags = SS_NO_FIRE
init_order = INIT_ORDER_OVERMAPS
/datum/controller/subsystem/overmaps/Initialize()
if(GLOB.using_map.use_overmap)
GLOB.overmap_event_handler.create_events(GLOB.using_map.overmap_z, GLOB.using_map.overmap_size, GLOB.using_map.overmap_event_areas)
rebuild_helm_computers()
return ..()
/datum/controller/subsystem/overmaps/proc/rebuild_helm_computers()
for(var/obj/machinery/computer/ship/helm/H in global.machines)
H.get_known_sectors()
/datum/controller/subsystem/overmaps/proc/queue_helm_computer_rebuild()
if(!subsystem_initialized)
return
addtimer(CALLBACK(src, .proc/rebuild_helm_computers), 0, TIMER_UNIQUE)

View File

@@ -22,10 +22,7 @@
return INITIALIZE_HINT_QDEL
if(known && !mapload)
//layer = ABOVE_LIGHTING_LAYER
plane = PLANE_LIGHTING_ABOVE
for(var/obj/machinery/computer/ship/helm/H in global.machines)
H.get_known_sectors()
SSovermaps.queue_helm_computer_rebuild()
update_icon()
/obj/effect/overmap/Crossed(var/obj/effect/overmap/visitable/other)

View File

@@ -249,6 +249,7 @@
#include "code\controllers\subsystems\nanoui.dm"
#include "code\controllers\subsystems\openspace.dm"
#include "code\controllers\subsystems\overlays.dm"
#include "code\controllers\subsystems\overmap.dm"
#include "code\controllers\subsystems\persist_vr.dm"
#include "code\controllers\subsystems\planets.dm"
#include "code\controllers\subsystems\radiation.dm"