From 36ce234621205cb96597bfc37eed5ea49e7a4488 Mon Sep 17 00:00:00 2001 From: uporotiy Date: Thu, 12 May 2011 10:41:36 +0000 Subject: [PATCH] ACTUALLY fixed the memory leak. Goddomot copytext() why you so confusing. Also, the huds now show wanted/prisoner status. git-svn-id: http://tgstation13.googlecode.com/svn/trunk@1572 316c924e-a436-60f5-8080-3fe189b3f50e --- code/modules/mob/living/carbon/human/life.dm | 15 +++++++-------- icons/mob/hud.dmi | Bin 1788 -> 1753 bytes 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm index cdb1ae3a563..f3d14cd0852 100644 --- a/code/modules/mob/living/carbon/human/life.dm +++ b/code/modules/mob/living/carbon/human/life.dm @@ -746,7 +746,7 @@ if(client) for(var/image/hud in client.images) - if(copytext(hud.icon_state,4) == "hud") //ugly, but icon comparison is worse, I believe + if(copytext(hud.icon_state,1,4) == "hud") //ugly, but icon comparison is worse, I believe del(hud) if (src.stat == 2 || src.mutations & XRAY) @@ -801,14 +801,13 @@ for(var/mob/living/carbon/human/perp in view(src)) if(perp.wear_id) client.images += image(tempHud,perp,"hud[ckey(perp:wear_id:GetJobName())]") + var/perpname = "wot" + if(istype(perp.wear_id,/obj/item/weapon/card/id)) + perpname = perp.wear_id:registered + else if(istype(perp.wear_id,/obj/item/device/pda)) + var/obj/item/device/pda/tempPda = perp.wear_id + perpname = tempPda.owner for (var/datum/data/record/E in data_core.general) - var/perpname = "wot" - if(istype(perp.wear_id,/obj/item/weapon/card/id)) - perpname = perp.wear_id:registered - else if(istype(perp.wear_id,/obj/item/device/pda)) - var/obj/item/device/pda/tempPda = perp.wear_id - perpname = tempPda.owner - world << "[perpname]" if (E.fields["name"] == perpname) for (var/datum/data/record/R in data_core.security) if ((R.fields["id"] == E.fields["id"]) && (R.fields["criminal"] == "*Arrest*")) diff --git a/icons/mob/hud.dmi b/icons/mob/hud.dmi index dcce261c23a7b3cfc9f50478e013fa41f62cefec..f4060cb47160f32a0ab57b02f1cdc88b0de4967e 100644 GIT binary patch delta 1562 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