mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-07-17 02:54:44 +01:00
Refactors move procs to support multitle objects (#59658)
Enter(), Entered(), Exit() and Exited() all passed the old loc forward, but everything except a single a case cared about the direction of the movement more than about the specific source. Since moving multi-tile objects will have multiple sources of movement but a single direction, this change makes it easier to track their movement. Cleaned up a lot of code around and made proc inputs compatible. I'll add opacity support for multi-tile objects in a different PR after this is merged, as this has grown large enough and I don't want to compromise the reviewability. Tested this locally and as expected it didn't impair movement nor produced any runtimes.
This commit is contained in:
@@ -423,9 +423,9 @@
|
||||
// Objects that try to exit a locker by stepping were doing so successfully,
|
||||
// and due to an oversight in turf/Enter() were going through walls. That
|
||||
// should be independently resolved, but this is also an interesting twist.
|
||||
/obj/structure/closet/Exit(atom/movable/AM)
|
||||
/obj/structure/closet/Exit(atom/movable/leaving, direction)
|
||||
open()
|
||||
if(AM.loc == src)
|
||||
if(leaving.loc == src)
|
||||
return FALSE
|
||||
return TRUE
|
||||
|
||||
|
||||
@@ -173,9 +173,9 @@ GLOBAL_LIST_EMPTY(lifts)
|
||||
lift_master_datum = new(src)
|
||||
|
||||
|
||||
/obj/structure/industrial_lift/proc/UncrossedRemoveItemFromLift(datum/source, atom/movable/potential_rider)
|
||||
/obj/structure/industrial_lift/proc/UncrossedRemoveItemFromLift(datum/source, atom/movable/gone, direction)
|
||||
SIGNAL_HANDLER
|
||||
RemoveItemFromLift(potential_rider)
|
||||
RemoveItemFromLift(gone)
|
||||
|
||||
/obj/structure/industrial_lift/proc/RemoveItemFromLift(atom/movable/potential_rider)
|
||||
SIGNAL_HANDLER
|
||||
|
||||
@@ -84,10 +84,10 @@
|
||||
|
||||
AddElement(/datum/element/connect_loc, src, loc_connections)
|
||||
|
||||
/obj/structure/railing/proc/on_exit(datum/source, atom/movable/leaving, atom/new_location)
|
||||
/obj/structure/railing/proc/on_exit(datum/source, atom/movable/leaving, direction)
|
||||
SIGNAL_HANDLER
|
||||
|
||||
if(!(get_dir(leaving.loc, new_location) & dir))
|
||||
if(!(direction & dir))
|
||||
return
|
||||
|
||||
if (!density)
|
||||
|
||||
@@ -60,10 +60,10 @@
|
||||
if(S)
|
||||
S.update_appearance()
|
||||
|
||||
/obj/structure/stairs/proc/on_exit(datum/source, atom/movable/leaving, atom/new_location)
|
||||
/obj/structure/stairs/proc/on_exit(datum/source, atom/movable/leaving, direction)
|
||||
SIGNAL_HANDLER
|
||||
|
||||
if(!isobserver(leaving) && isTerminator() && (get_dir(src, new_location) == dir))
|
||||
if(!isobserver(leaving) && isTerminator() && direction == dir)
|
||||
INVOKE_ASYNC(src, .proc/stair_ascend, leaving)
|
||||
leaving.Bump(src)
|
||||
return COMPONENT_ATOM_BLOCK_EXIT
|
||||
|
||||
@@ -74,13 +74,13 @@
|
||||
else
|
||||
return 1
|
||||
|
||||
/obj/structure/windoor_assembly/proc/on_exit(datum/source, atom/movable/leaving, atom/new_location)
|
||||
/obj/structure/windoor_assembly/proc/on_exit(datum/source, atom/movable/leaving, direction)
|
||||
SIGNAL_HANDLER
|
||||
|
||||
if (leaving.pass_flags & pass_flags_self)
|
||||
return
|
||||
|
||||
if (get_dir(loc, new_location) == dir && density)
|
||||
if (direction == dir && density)
|
||||
leaving.Bump(src)
|
||||
return COMPONENT_ATOM_BLOCK_EXIT
|
||||
|
||||
|
||||
@@ -124,7 +124,7 @@
|
||||
|
||||
return TRUE
|
||||
|
||||
/obj/structure/window/proc/on_exit(datum/source, atom/movable/leaving, atom/new_location)
|
||||
/obj/structure/window/proc/on_exit(datum/source, atom/movable/leaving, direction)
|
||||
SIGNAL_HANDLER
|
||||
|
||||
if (istype(leaving) && (leaving.pass_flags & pass_flags_self))
|
||||
@@ -133,7 +133,7 @@
|
||||
if (fulltile)
|
||||
return
|
||||
|
||||
if(get_dir(leaving.loc, new_location) == dir && density)
|
||||
if(direction == dir && density)
|
||||
leaving.Bump(src)
|
||||
return COMPONENT_ATOM_BLOCK_EXIT
|
||||
|
||||
|
||||
Reference in New Issue
Block a user