Skip to content

Commit

Permalink
Fixes build_appearance_list not preserving order (#433)
Browse files Browse the repository at this point in the history
  • Loading branch information
francinum committed Jul 24, 2023
1 parent 58d6e5e commit 26b4d34
Showing 1 changed file with 9 additions and 5 deletions.
14 changes: 9 additions & 5 deletions code/controllers/subsystem/overlays.dm
Original file line number Diff line number Diff line change
Expand Up @@ -37,12 +37,16 @@ SUBSYSTEM_DEF(overlays)
iconbro.icon = icon
return iconbro.appearance

/atom/proc/build_appearance_list(build_overlays)
/atom/proc/build_appearance_list(list/build_overlays)
if (!islist(build_overlays))
build_overlays = list(build_overlays)
/// Tracks the current index into build_overlays so that we can preserve ordering.
var/bo_index = 0
for (var/overlay in build_overlays)
bo_index++
if(!overlay)
build_overlays -= overlay
bo_index--
continue
if (istext(overlay))
#ifdef UNIT_TESTS
Expand All @@ -53,11 +57,11 @@ SUBSYSTEM_DEF(overlays)
stack_trace("Invalid overlay: Icon object '[icon_file]' [REF(icon)] used in '[src]' [type] is missing icon state [overlay].")
continue
#endif
build_overlays -= overlay
build_overlays += iconstate2appearance(icon, overlay)
// Directly overwrite the list entry, preserving order.
build_overlays[bo_index] = iconstate2appearance(icon, overlay)
else if(isicon(overlay))
build_overlays -= overlay
build_overlays += icon2appearance(overlay)
// Directly overwrite the list entry, preserving order.
build_overlays[bo_index] = icon2appearance(overlay)
return build_overlays

/atom/proc/cut_overlays()
Expand Down

0 comments on commit 26b4d34

Please sign in to comment.