From 868b4cb316c41d606eb8e15b9971fd411fdefa3c Mon Sep 17 00:00:00 2001 From: Seth Scherer Date: Tue, 29 Mar 2022 18:03:37 -0400 Subject: [PATCH] Renames the `change_area` proc to be more accurate (#65758) --- code/__HELPERS/areas.dm | 2 +- code/modules/lighting/lighting_turf.dm | 3 ++- code/modules/shuttle/on_move.dm | 4 ++-- code/modules/shuttle/shuttle.dm | 2 +- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/code/__HELPERS/areas.dm b/code/__HELPERS/areas.dm index b6c5739f8cf..e7876df8ae7 100644 --- a/code/__HELPERS/areas.dm +++ b/code/__HELPERS/areas.dm @@ -87,7 +87,7 @@ GLOBAL_LIST_INIT(typecache_powerfailure_safe_areas, typecacheof(/area/engineerin var/turf/thing = turfs[i] var/area/old_area = thing.loc newA.contents += thing - thing.change_area(old_area, newA) + thing.transfer_area_lighting(old_area, newA) newA.reg_in_areas_in_z() diff --git a/code/modules/lighting/lighting_turf.dm b/code/modules/lighting/lighting_turf.dm index 7f7799d7549..acec70f3c13 100644 --- a/code/modules/lighting/lighting_turf.dm +++ b/code/modules/lighting/lighting_turf.dm @@ -91,7 +91,8 @@ reconsider_lights() //The lighting system only cares whether the tile is fully concealed from all directions or not. -/turf/proc/change_area(area/old_area, area/new_area) +///Transfer the lighting of one area to another +/turf/proc/transfer_area_lighting(area/old_area, area/new_area) if(SSlighting.initialized) if (new_area.static_lighting != old_area.static_lighting) if (new_area.static_lighting) diff --git a/code/modules/shuttle/on_move.dm b/code/modules/shuttle/on_move.dm index 47a66b08c4b..2ddc73e2527 100644 --- a/code/modules/shuttle/on_move.dm +++ b/code/modules/shuttle/on_move.dm @@ -154,7 +154,7 @@ All ShuttleMove procs go here contents -= oldT underlying_old_area.contents += oldT - oldT.change_area(src, underlying_old_area) + oldT.transfer_area_lighting(src, underlying_old_area) //The old turf has now been given back to the area that turf originaly belonged to var/area/old_dest_area = newT.loc @@ -162,7 +162,7 @@ All ShuttleMove procs go here old_dest_area.contents -= newT contents += newT - newT.change_area(old_dest_area, src) + newT.transfer_area_lighting(old_dest_area, src) return TRUE // Called on areas after everything has been moved diff --git a/code/modules/shuttle/shuttle.dm b/code/modules/shuttle/shuttle.dm index 134978bc73a..6eee9c119a8 100644 --- a/code/modules/shuttle/shuttle.dm +++ b/code/modules/shuttle/shuttle.dm @@ -621,7 +621,7 @@ continue var/area/old_area = oldT.loc underlying_area.contents += oldT - oldT.change_area(old_area, underlying_area) + oldT.transfer_area_lighting(old_area, underlying_area) oldT.empty(FALSE) // Here we locate the bottommost shuttle boundary and remove all turfs above it