cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2025-12-29 11:02:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixes a runtime in atom init management (#76241)

Browse Source 
## About The Pull Request

The issue was map verification calling build_cache, which uses the
define which enables/disables init values on sleep. We avoid this by
using a var on map datums and using that to enable the init value
modification only when we are actually loading stuff.

Also fixes a bug in clear_tracked_initialize() where it being called
with no values lead to bad values/potentially overriding initialized on
accident.

Also also I forgot how for loops worked so this would not have worked
regardless

## Why It's Good For The Game

Code should like, function
This commit is contained in:
LemonInTheDark
2023-06-21 20:20:49 -07:00
committed by GitHub
parent 7bfbd5f129
commit cf92862daf
2 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/controllers/subsystem/atoms.dm
View File

@@ -175,7 +175,9 @@ SUBSYSTEM_DEF(atoms)
initialized = state initialized = state
/datum/controller/subsystem/atoms/proc/clear_tracked_initalize(source) /datum/controller/subsystem/atoms/proc/clear_tracked_initalize(source)
for(var/i in length(initialized_state) to 1) if(!length(initialized_state))
return
for(var/i in length(initialized_state) to 1 step -1)
if(initialized_state[i][1] == source) if(initialized_state[i][1] == source)
initialized_state.Cut(i, i+1) initialized_state.Cut(i, i+1)
break break

15
code/modules/mapping/reader.dm
View File

@@ -107,6 +107,9 @@
/// Pulls out model paths for DMM /// Pulls out model paths for DMM
var/static/regex/model_path = new(@'(\/[^\{]*?(?:\{.*?\})?)(?:,|$)', "g") var/static/regex/model_path = new(@'(\/[^\{]*?(?:\{.*?\})?)(?:,|$)', "g")
/// If we are currently loading this map
var/loading = FALSE
#ifdef TESTING #ifdef TESTING
var/turfsSkipped = 0 var/turfsSkipped = 0
#endif #endif
@@ -249,9 +252,13 @@
#define MAPLOADING_CHECK_TICK \ #define MAPLOADING_CHECK_TICK \
if(TICK_CHECK) { \ if(TICK_CHECK) { \
SSatoms.map_loader_stop(REF(src)); \ if(loading) { \
stoplag(); \ SSatoms.map_loader_stop(REF(src)); \
SSatoms.map_loader_begin(REF(src)); \ stoplag(); \
SSatoms.map_loader_begin(REF(src)); \
} else { \
stoplag(); \
} \
} }
// Do not call except via load() above. // Do not call except via load() above.
@@ -259,6 +266,7 @@
PRIVATE_PROC(TRUE) PRIVATE_PROC(TRUE)
// Tell ss atoms that we're doing maploading // Tell ss atoms that we're doing maploading
// We'll have to account for this in the following tick_checks so it doesn't overflow // We'll have to account for this in the following tick_checks so it doesn't overflow
loading = TRUE
SSatoms.map_loader_begin(REF(src)) SSatoms.map_loader_begin(REF(src))
// Loading used to be done in this proc // Loading used to be done in this proc
@@ -273,6 +281,7 @@
// And we are done lads, call it off // And we are done lads, call it off
SSatoms.map_loader_stop(REF(src)) SSatoms.map_loader_stop(REF(src))
loading = FALSE
if(new_z) if(new_z)
for(var/z_index in bounds[MAP_MINZ] to bounds[MAP_MAXZ]) for(var/z_index in bounds[MAP_MINZ] to bounds[MAP_MAXZ])