mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-01-18 13:04:45 +00:00
ccef887efe
# MAINTAINER - USE THE BUTTON THAT SAYS "MERGE MASTER" THEN SET THE PR TO AUTO-MERGE! IT'S MUCH EASIER FOR ME TO FIX THINGS BEFORE THEY SKEW RATHER THAN AFTER THE FACT. ## About The Pull Request Hey there, This took a while to do, but here's the gist: Python file now regexes every file in `/code` except for those that have some valid reason to be tacking on more global defines. Some of those reasons are simply just that I don't have the time right now (doing what you see in this PR took a few hours) to refactor and parse what should belong and what should be thrown out. For the time being though, this PR will at least _halt_ people making the mistake of not `#undef`ing any files they `#define` "locally", or within the scope of a file. Most people forget to do this and this leads to a lot of mess later on due to how many variables can be unmanaged on the global level. I've made this mistake, you've made this mistake, it's a common thing. Let's automatically check for it so it can be fixed no-stress. Scenarios this PR corrects: * Forgetting to undef a define but undeffing others. * Not undeffing any defines in your file. * Earmarking a define as a "file local" define, but not defining it. * Having a define be a "file local" define, but having it be used elsewhere. * Having a "local" define not even be in the file that it only shows up in. * Having a completely unused define* (* I kept some of these because they seemed important... Others were junked.) ## Why It's Good For The Game If you wanna use it across multiple files, no reason to not make it a global define (maybe there's a few reasons but let's assume that this is the 95% case). Let me know if you don't like how I re-arranged some of the defines and how you'd rather see it be implemented, and I'd be happy to do that. This was mostly just "eh does it need it or not" sorta stuff. I used a pretty cool way to detect if we should use the standardized GitHub "error" output, you can see the results of that here https://github.com/san7890/bruhstation/actions/runs/4549766579/jobs/8022186846#step:7:792 ## Changelog Nothing that really concerns players. (I fixed up all this stuff using vscode, no regexes beyond what you see in the python script. sorry downstreams)
58 lines
2.1 KiB
Plaintext
58 lines
2.1 KiB
Plaintext
#define ALLOWED_LOOSE_TURFS 500
|
|
/**
|
|
* Responsible for managing the sizes of area.contained_turfs and area.turfs_to_uncontain
|
|
* These lists do not check for duplicates, which is fine, but it also means they can balloon in size over time
|
|
* as a consequence of repeated changes in area in a space
|
|
* They additionally may not always resolve often enough to avoid memory leaks
|
|
* This is annoying, so lets keep an eye on them and cut them down to size if needed
|
|
*/
|
|
SUBSYSTEM_DEF(area_contents)
|
|
name = "Area Contents"
|
|
flags = SS_NO_INIT
|
|
runlevels = RUNLEVEL_LOBBY|RUNLEVELS_DEFAULT
|
|
var/list/currentrun
|
|
var/list/area/marked_for_clearing = list()
|
|
|
|
/datum/controller/subsystem/area_contents/stat_entry(msg)
|
|
var/total_clearing_from = 0
|
|
var/total_to_clear = 0
|
|
for(var/area/to_clear as anything in marked_for_clearing)
|
|
total_to_clear += length(to_clear.turfs_to_uncontain)
|
|
total_clearing_from += length(to_clear.contained_turfs)
|
|
msg = "A:[length(currentrun)] MR:[length(marked_for_clearing)] TC:[total_to_clear] CF:[total_clearing_from]"
|
|
return ..()
|
|
|
|
|
|
/datum/controller/subsystem/area_contents/fire(resumed)
|
|
if(!resumed)
|
|
currentrun = GLOB.areas.Copy()
|
|
|
|
while(length(currentrun))
|
|
var/area/test = currentrun[length(currentrun)]
|
|
if(length(test.turfs_to_uncontain) > ALLOWED_LOOSE_TURFS)
|
|
marked_for_clearing |= test
|
|
currentrun.len--
|
|
if(MC_TICK_CHECK)
|
|
return
|
|
|
|
// Alright, if we've done a scan on all our areas, it's time to knock the existing ones down to size
|
|
while(length(marked_for_clearing))
|
|
var/area/clear = marked_for_clearing[length(marked_for_clearing)]
|
|
|
|
// The operation of cutting large lists can be expensive
|
|
// It scales almost directly with the size of the list we're cutting with
|
|
// Because of this, we're gonna stick to cutting 1 entry at a time
|
|
// There's no reason to batch it I promise, this is faster. No overtime too
|
|
var/amount_cut = 0
|
|
var/list/cut_from = clear.turfs_to_uncontain
|
|
for(amount_cut in 1 to length(cut_from))
|
|
clear.contained_turfs -= cut_from[amount_cut]
|
|
if(MC_TICK_CHECK)
|
|
cut_from.Cut(1, amount_cut + 1)
|
|
return
|
|
|
|
clear.turfs_to_uncontain = list()
|
|
marked_for_clearing.len--
|
|
|
|
#undef ALLOWED_LOOSE_TURFS
|