Added maptick.

This commit is contained in:
Putnam
2021-01-06 23:55:06 -08:00
parent f0b3ad7a22
commit 555c384d73
9 changed files with 20 additions and 14 deletions
+2 -1
View File
@@ -1,2 +1,3 @@
#define EXTOOLS (world.system_type == MS_WINDOWS ? "byond-extools.dll" : "libbyond-extools.so")
#define AUXTOOLS (world.system_type == MS_WINDOWS ? "auxmos.dll" : "auxmos.so")
#define AUXMOS (world.system_type == MS_WINDOWS ? "auxmos.dll" : "auxmos.so")
#define AUXMAPTICK ((world.system_type == MS_WINDOWS ? "auxmaptick.dll" : "auxmaptick.so"))
+8 -8
View File
@@ -7,13 +7,13 @@
/proc/auxtools_stack_trace(msg)
CRASH(msg)
GLOBAL_VAR_INIT(auxtools_initialized,FALSE)
GLOBAL_LIST_EMPTY(auxtools_initialized)
#define AUXTOOLS_CHECK\
if (!GLOB.auxtools_initialized && fexists(AUXTOOLS) && findtext(call(AUXTOOLS,"auxtools_init")(),"SUCCESS"))\
GLOB.auxtools_initialized = TRUE;\
#define AUXTOOLS_CHECK(LIB)\
if (!GLOB.auxtools_initialized[LIB] && fexists(LIB) && findtext(call(LIB,"auxtools_init")(),"SUCCESS"))\
GLOB.auxtools_initialized[LIB] = TRUE;\
#define AUXTOOLS_SHUTDOWN\
if (GLOB.auxtools_initialized && fexists(AUXTOOLS))\
call(AUXTOOLS,"auxtools_shutdown")();\
GLOB.auxtools_initialized = FALSE;\
#define AUXTOOLS_SHUTDOWN(LIB)\
if (GLOB.auxtools_initialized[LIB] && fexists(LIB))\
call(LIB,"auxtools_shutdown")();\
GLOB.auxtools_initialized[LIB] = FALSE;\
+1 -1
View File
@@ -280,7 +280,7 @@ SUBSYSTEM_DEF(air)
*/
/datum/controller/subsystem/air/proc/process_excited_groups(resumed = 0)
if(!process_excited_groups_extools(resumed,MC_TICK_REMAINING_MS))
if(process_excited_groups_extools(resumed,MC_TICK_REMAINING_MS))
pause()
/datum/controller/subsystem/air/proc/process_turfs_extools()
+8 -3
View File
@@ -9,17 +9,21 @@ GLOBAL_LIST(topic_status_cache)
//This happens after the Master subsystem new(s) (it's a global datum)
//So subsystems globals exist, but are not initialised
/proc/initialize_maptick()
CRASH("Auxtools is not loaded!")
/world/New()
var/debug_server = world.GetConfig("env", "AUXTOOLS_DEBUG_DLL")
if (debug_server)
call(debug_server, "auxtools_init")()
enable_debugging()
AUXTOOLS_CHECK
AUXTOOLS_CHECK(AUXMOS)
#ifdef REFERENCE_TRACKING
enable_reference_tracking()
#endif
world.Profile(PROFILE_START)
AUXTOOLS_CHECK(AUXMAPTICK)
initialize_maptick()
log_world("World loaded at [TIME_STAMP("hh:mm:ss", FALSE)]!")
GLOB.config_error_log = GLOB.world_manifest_log = GLOB.world_pda_log = GLOB.world_job_debug_log = GLOB.sql_error_log = GLOB.world_href_log = GLOB.world_runtime_log = GLOB.world_attack_log = GLOB.world_game_log = "data/logs/config_error.[GUID()].log" //temporary file used to record errors with loading config, moved to log directory once logging is set bl
@@ -271,7 +275,8 @@ GLOBAL_LIST(topic_status_cache)
/world/Del()
shutdown_logging() // makes sure the thread is closed before end, else we terminate
AUXTOOLS_SHUTDOWN
AUXTOOLS_SHUTDOWN(AUXMOS)
AUXTOOLS_SHUTDOWN(AUXMAPTICK)
var/debug_server = world.GetConfig("env", "AUXTOOLS_DEBUG_DLL")
if (debug_server)
call(debug_server, "auxtools_shutdown")()
@@ -30,7 +30,7 @@ GLOBAL_LIST_INIT(auxtools_atmos_initialized,FALSE)
/datum/gas_mixture/New(volume)
if (!isnull(volume))
initial_volume = volume
AUXTOOLS_CHECK
AUXTOOLS_CHECK(AUXMOS)
if(!GLOB.auxtools_atmos_initialized && auxtools_atmos_init())
GLOB.auxtools_atmos_initialized = TRUE
__gasmixture_register()