Merge remote-tracking branch 'upstream/master'
This commit is contained in:
@@ -38,7 +38,7 @@ GLOBAL_DATUM_INIT(openspace_backdrop_one_for_all, /atom/movable/openspace_backdr
|
||||
|
||||
/turf/open/openspace/Initialize(mapload) // handle plane and layer here so that they don't cover other obs/turfs in Dream Maker
|
||||
. = ..()
|
||||
vis_contents += GLOB.openspace_backdrop_one_for_all //Special grey square for projecting backdrop darkness filter on it.
|
||||
overlays += GLOB.openspace_backdrop_one_for_all //Special grey square for projecting backdrop darkness filter on it.
|
||||
return INITIALIZE_HINT_LATELOAD
|
||||
|
||||
/turf/open/openspace/LateInitialize()
|
||||
|
||||
@@ -14,6 +14,11 @@ GLOBAL_LIST(topic_status_cache)
|
||||
LIBCALL(dll, "auxtools_init")()
|
||||
enable_debugging()
|
||||
|
||||
#ifdef USE_BYOND_TRACY
|
||||
#warn USE_BYOND_TRACY is enabled
|
||||
init_byond_tracy()
|
||||
#endif
|
||||
|
||||
world.Profile(PROFILE_START)
|
||||
log_world("World loaded at [TIME_STAMP("hh:mm:ss", FALSE)]!")
|
||||
|
||||
@@ -369,3 +374,19 @@ GLOBAL_LIST(topic_status_cache)
|
||||
|
||||
/world/proc/on_tickrate_change()
|
||||
SStimer?.reset_buckets()
|
||||
|
||||
/world/proc/init_byond_tracy()
|
||||
var/library
|
||||
|
||||
switch (system_type)
|
||||
if (MS_WINDOWS)
|
||||
library = "prof.dll"
|
||||
if (UNIX)
|
||||
library = "libprof.so"
|
||||
else
|
||||
CRASH("Unsupported platform: [system_type]")
|
||||
|
||||
var/init_result = call_ext(library, "init")("block")
|
||||
if (init_result != "0")
|
||||
CRASH("Error initializing byond-tracy: [init_result]")
|
||||
|
||||
|
||||
Reference in New Issue
Block a user