|
264 | 264 | * Passed into CanAStarPass to provide context for a pathing attempt |
265 | 265 | * |
266 | 266 | * Also used to check if using a cached path_map is safe |
267 | | - * There are some vars here that are unused. They exist to cover cases where caller_ref is used |
268 | | - * They're the properties of caller_ref used in those cases. |
| 267 | + * There are some vars here that are unused. They exist to cover cases where requester_ref is used |
| 268 | + * They're the properties of requester_ref used in those cases. |
269 | 269 | * It's kinda annoying, but there's some proc chains we can't convert to this datum |
270 | 270 | */ |
271 | 271 | /datum/can_pass_info |
|
314 | 314 | /// Weakref to the requester used to generate this info |
315 | 315 | /// Should not use this almost ever, it's for context and to allow for proc chains that |
316 | 316 | /// Require a movable |
317 | | - var/datum/weakref/caller_ref = null |
| 317 | + var/datum/weakref/requester_ref = null |
318 | 318 |
|
319 | 319 | /datum/can_pass_info/New(atom/movable/construct_from, list/access, no_id = FALSE, call_depth = 0) |
320 | 320 | // No infiniloops |
|
327 | 327 | if(isnull(construct_from)) |
328 | 328 | return |
329 | 329 |
|
330 | | - src.caller_ref = WEAKREF(construct_from) |
| 330 | + src.requester_ref = WEAKREF(construct_from) |
331 | 331 | src.pass_flags = construct_from.pass_flags |
332 | 332 | src.movement_type = construct_from.movement_type |
333 | 333 | src.thrown = !!construct_from.throwing |
@@ -361,8 +361,8 @@ GLOBAL_LIST_INIT(can_pass_info_vars, GLOBAL_PROC_REF(can_pass_check_vars)) |
361 | 361 | var/datum/isaac = new() |
362 | 362 | var/list/altar = assoc_to_keys(lamb.vars - isaac.vars) |
363 | 363 | // Don't compare against calling atom, it's not relevant here |
364 | | - altar -= "caller_ref" |
365 | | - ASSERT("caller_ref" in lamb.vars, "caller_ref var was not found in /datum/can_pass_info, why are we filtering for it?") |
| 364 | + altar -= "requester_ref" |
| 365 | + ASSERT("requester_ref" in lamb.vars, "requester_ref var was not found in /datum/can_pass_info, why are we filtering for it?") |
366 | 366 | // We will bespoke handle pulling_info |
367 | 367 | altar -= "pulling_info" |
368 | 368 | ASSERT("pulling_info" in lamb.vars, "pulling_info var was not found in /datum/can_pass_info, why are we filtering for it?") |
|
0 commit comments