Skip to content

Minor optimization to hot minimap procs #12747

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
boskoramen merged 3 commits into from
Jul 28, 2026
Merged

Minor optimization to hot minimap procs #12747

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f7d9e0d
perf optimization
Jul 27, 2026
e50758c
you too
Jul 27, 2026
595aa20
removes comment. not relevant
Jul 27, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 13 additions & 10 deletions code/controllers/subsystem/minimap.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -624,18 +624,20 @@ SUBSYSTEM_DEF(minimaps)
*/
/image/proc/minimap_on_move(atom/movable/source, oldloc)
SIGNAL_HANDLER
if(isturf(source.loc))
pixel_x = MINIMAP_PIXEL_FROM_WORLD(source.x) + SSminimaps.minimaps_by_z["[source.z]"].x_offset
pixel_y = MINIMAP_PIXEL_FROM_WORLD(source.y) + SSminimaps.minimaps_by_z["[source.z]"].y_offset
if(source.z)

@boskoramen boskoramen Jul 27, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this is a neat way to check if an atom is on a turf, might be worth exporting this check to a helper define

@fira fira Jul 28, 2026

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah i use that everywhere, figure it's simpler and faster.
Technically it can fail in one way, if you nullspace it, you can VV z only to a value and it'll still be nullspaced since x/y are 0. But that's obviously not supposed to happen, just like you aren't supposed to change loc.

var/datum/hud_displays/minimap = SSminimaps.minimaps_by_z["[source.z]"]
pixel_x = MINIMAP_PIXEL_FROM_WORLD(source.x) + minimap.x_offset
pixel_y = MINIMAP_PIXEL_FROM_WORLD(source.y) + minimap.y_offset
return

var/atom/movable/movable_loc = source.loc
source.override_minimap_tracking(source.loc)
pixel_x = MINIMAP_PIXEL_FROM_WORLD(movable_loc.x) + SSminimaps.minimaps_by_z["[movable_loc.z]"].x_offset
pixel_y = MINIMAP_PIXEL_FROM_WORLD(movable_loc.y) + SSminimaps.minimaps_by_z["[movable_loc.z]"].y_offset
var/atom/movable/movable_loc = source.loc // How does none of this just crash if the loc isn't on map?
source.override_minimap_tracking()
var/datum/hud_displays/minimap = SSminimaps.minimaps_by_z["[movable_loc.z]"]
pixel_x = MINIMAP_PIXEL_FROM_WORLD(movable_loc.x) + minimap.x_offset
pixel_y = MINIMAP_PIXEL_FROM_WORLD(movable_loc.y) + minimap.y_offset

///Used to handle minimap tracking inside other movables
/atom/movable/proc/override_minimap_tracking(atom/movable/loc)
/atom/movable/proc/override_minimap_tracking()
var/image/blip = SSminimaps.images_by_source[src]
blip.RegisterSignal(loc, COMSIG_MOVABLE_MOVED, TYPE_PROC_REF(/image, minimap_on_move))
RegisterSignal(loc, COMSIG_ATOM_EXITED, PROC_REF(cancel_override_minimap_tracking))
Expand All @@ -659,9 +661,10 @@ SUBSYSTEM_DEF(minimaps)
return
UnregisterSignal(source, list(COMSIG_PARENT_QDELETING, COMSIG_MOVABLE_Z_CHANGED))
var/turf/source_turf = get_turf(source)
var/datum/hud_displays/minimap = minimaps_by_z["[source_turf.z]"]
for(var/flag in GLOB.all_minimap_flags)
minimaps_by_z["[source_turf.z]"].images_assoc["[flag]"] -= source
minimaps_by_z["[source_turf.z]"].images_assoc["[flag]label"] -= source
minimap.images_assoc["[flag]"] -= source
minimap.images_assoc["[flag]label"] -= source
images_by_source -= source
removal_cbs[source].Invoke()
removal_cbs -= source
Expand Down
Loading