Revert "Overlay/Roundstart fixpack (#24356)"

This reverts commit bf42d769e2.
This commit is contained in:
Cyberboss
2017-02-22 20:43:08 -05:00
parent 6a2291c0d7
commit 4aefd57cca
4 changed files with 14 additions and 31 deletions

View File

@@ -954,8 +954,6 @@ var/global/list/humanoid_icon_cache = list()
if(outfit) if(outfit)
body.equipOutfit(outfit, TRUE) body.equipOutfit(outfit, TRUE)
SSoverlays.Flush()
var/icon/out_icon = icon('icons/effects/effects.dmi', "nothing") var/icon/out_icon = icon('icons/effects/effects.dmi', "nothing")
body.setDir(NORTH) body.setDir(NORTH)

View File

@@ -18,29 +18,25 @@ var/datum/subsystem/processing/overlays/SSoverlays
/datum/subsystem/processing/overlays/Initialize() /datum/subsystem/processing/overlays/Initialize()
initialized = TRUE initialized = TRUE
Flush() for(var/I in processing)
var/atom/A = I
A.compile_overlays()
CHECK_TICK
processing.Cut()
..() ..()
/datum/subsystem/processing/overlays/Recover() /datum/subsystem/processing/overlays/Recover()
overlay_icon_state_caches = SSoverlays.overlay_icon_state_caches overlay_icon_state_caches = SSoverlays.overlay_icon_state_caches
processing = SSoverlays.processing processing = SSoverlays.processing
/datum/subsystem/processing/overlays/fire(resumed = FALSE, mc_check = TRUE) /datum/subsystem/processing/overlays/fire()
while(processing.len) while(processing.len)
var/atom/thing = processing[processing.len] var/atom/thing = processing[processing.len]
processing.len-- processing.len--
if(thing) if(thing)
thing.compile_overlays(FALSE) thing.compile_overlays(FALSE)
if(mc_check) if(MC_TICK_CHECK)
if(MC_TICK_CHECK) break
break
else
CHECK_TICK
/datum/subsystem/processing/overlays/proc/Flush()
if(processing.len)
testing("Flushing [processing.len] overlays")
fire(mc_check = FALSE) //pair this thread up with the MC to get extra compile time
/atom/proc/compile_overlays() /atom/proc/compile_overlays()
if(LAZYLEN(priority_overlays) && LAZYLEN(our_overlays)) if(LAZYLEN(priority_overlays) && LAZYLEN(our_overlays))

View File

@@ -201,10 +201,6 @@ var/datum/subsystem/ticker/ticker
CHECK_TICK CHECK_TICK
equip_characters() equip_characters()
CHECK_TICK CHECK_TICK
SSoverlays.Flush() //Flush the majority of the shit
CHECK_TICK
data_core.manifest() data_core.manifest()
CHECK_TICK CHECK_TICK

View File

@@ -66,9 +66,8 @@
return return
/datum/datacore/proc/manifest() /datum/datacore/proc/manifest()
for(var/mob/new_player/N in player_list) for(var/mob/living/carbon/human/H in player_list)
if(ishuman(N.new_character)) manifest_inject(H)
manifest_inject(N.new_character, N.client)
CHECK_TICK CHECK_TICK
/datum/datacore/proc/manifest_modify(name, assignment) /datum/datacore/proc/manifest_modify(name, assignment)
@@ -185,7 +184,7 @@
var/record_id_num = 1001 var/record_id_num = 1001
/datum/datacore/proc/manifest_inject(mob/living/carbon/human/H, client/C) /datum/datacore/proc/manifest_inject(mob/living/carbon/human/H)
if(H.mind && (H.mind.assigned_role != H.mind.special_role)) if(H.mind && (H.mind.assigned_role != H.mind.special_role))
var/assignment var/assignment
if(H.mind.assigned_role) if(H.mind.assigned_role)
@@ -196,9 +195,7 @@ var/record_id_num = 1001
assignment = "Unassigned" assignment = "Unassigned"
var/id = num2hex(record_id_num++,6) var/id = num2hex(record_id_num++,6)
if(!C) var/image = get_id_photo(H)
C = H.client
var/image = get_id_photo(H, C)
var/obj/item/weapon/photo/photo_front = new() var/obj/item/weapon/photo/photo_front = new()
var/obj/item/weapon/photo/photo_side = new() var/obj/item/weapon/photo/photo_side = new()
photo_front.photocreate(null, icon(image, dir = SOUTH)) photo_front.photocreate(null, icon(image, dir = SOUTH))
@@ -266,11 +263,7 @@ var/record_id_num = 1001
locked += L locked += L
return return
/datum/datacore/proc/get_id_photo(mob/living/carbon/human/H, client/C) /datum/datacore/proc/get_id_photo(mob/living/carbon/human/H)
var/datum/job/J = SSjob.GetJob(H.mind.assigned_role) var/datum/job/J = SSjob.GetJob(H.mind.assigned_role)
var/datum/preferences/P var/datum/preferences/P = H.client.prefs
if(!C)
C = H.client
if(C)
P = C.prefs
return get_flat_human_icon(null,J.outfit,P) return get_flat_human_icon(null,J.outfit,P)