Fix lighting on maps loaded after SSlighting init #4797
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
MistakeNot4892
previously approved these changes
Jan 24, 2025
Lohikar
requested changes
Jan 24, 2025
| @@ -57,7 +57,7 @@ SUBSYSTEM_DEF(lighting) | |||
| var/datum/level_data/level = SSmapping.levels_by_z[zlevel] | |||
| for (var/turf/tile as anything in block(1, 1, zlevel, level.level_max_width, level.level_max_height)) // include TRANSITIONEDGE turfs | |||
| if (TURF_IS_DYNAMICALLY_LIT_UNSAFE(tile)) | |||
| tile.lighting_build_overlay() | |||
| new /atom/movable/lighting_overlay(tile) | |||
There was a problem hiding this comment.
This should check that there's no existing overlay, they'll just be orphaned if they somehow exist.
Given that's an error/impossible case, just logging is all that should be necessary.
out-of-phaze
force-pushed
the
fix/lighting-post-init
branch
3 times, most recently
from
788d5b7 to
d59493e
Compare
Lohikar
reviewed
Jan 24, 2025
| @@ -57,7 +57,10 @@ SUBSYSTEM_DEF(lighting) | |||
| var/datum/level_data/level = SSmapping.levels_by_z[zlevel] | |||
| for (var/turf/tile as anything in block(1, 1, zlevel, level.level_max_width, level.level_max_height)) // include TRANSITIONEDGE turfs | |||
| if (TURF_IS_DYNAMICALLY_LIT_UNSAFE(tile)) | |||
| tile.lighting_build_overlay() | |||
| if(!isnull(tile.lighting_overlay)) | |||
| log_warning("Attempted to create lighting_overlay on tile that already had one.") | |||
There was a problem hiding this comment.
Suggested change
| log_warning("Attempted to create lighting_overlay on tile that already had one.") | |
| log_warning("Attempted to create lighting_overlay on tile ([tile.x],[tile.y],[tile.z]) that already had one.") |
out-of-phaze
force-pushed
the
fix/lighting-post-init
branch
from
d59493e to
2344d71
Compare
Lohikar
approved these changes
Jan 28, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes a regression caused by #4756.
Maploading only goes through new() and not changeturf. If we're loading a turf during mapload, and it's not in changeturf, and SSlighting init has already run, then we need to build the lighting overlay for that turf in Initialize().
I decided to do this rather than making it do a pass after expanding the world bounds (runs before the actual map loading is done, will do basically nothing because unsim filler turfs fail TIDLU) or after finishing loading a map (multiple relevant points, complicated for planets/etc., can result in missing some turfs or processing others twice.
Definitely needs proper review by @Lohikar to make sure I don't do an oopsie again and that I'm not overlooking a better solution.