hud_updateflag purge!

EXTERMINATUS BITCH
This commit is contained in:
Aurorablade
2015-12-13 17:16:14 -05:00
parent 0770171c2f
commit 95d8b50345
33 changed files with 76 additions and 379 deletions
+3 -5
View File
@@ -265,13 +265,11 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
set desc = "Toggles the medical HUD."
if(!client)
return
if(data_hud_seen) //remove old huds
var/datum/atom_hud/H = huds[data_hud_seen]
H.remove_hud_from(src)
var/datum/atom_hud/H = huds[DATA_HUD_MEDICAL_BASIC]
H.remove_hud_from(src)//out with the old..
if(medhud==0)//TOGGLE!
medhud = 1
show_me_the_hud(DATA_HUD_MEDICAL_BASIC)
H.add_hud_to(src)
else
medhud = 0
@@ -91,11 +91,6 @@
dizziness = 0
jitteriness = 0
//hud_updateflag |= 1 << HEALTH_HUD
//hud_updateflag |= 1 << STATUS_HUD
//handle_hud_list()
//Handle species-specific deaths.
if(species) species.handle_death(src)
@@ -486,7 +486,7 @@
var/mob/living/carbon/human/H = M
switch(hudtype)
if("security")
return istype(H.glasses, /obj/item/clothing/glasses/hud/security) || istype(H.glasses, /obj/item/clothing/glasses/sunglasses/sechud)
return istype(H.glasses, /obj/item/clothing/glasses/hud/security) || istype(H.glasses, /obj/item/clothing/glasses/hud/secsunglasses)
if("medical")
return istype(H.glasses, /obj/item/clothing/glasses/hud/health) || istype(H.glasses, /obj/item/clothing/glasses/hud/health_advanced)
else
@@ -29,17 +29,6 @@
reagents = R
R.my_atom = src
//hud_list[HEALTH_HUD] = image('icons/mob/hud.dmi', src, "hudhealth100")
//hud_list[STATUS_HUD] = image('icons/mob/hud.dmi', src, "hudhealthy")
//hud_list[ID_HUD] = image('icons/mob/hud.dmi', src, "hudunknown")
////hud_list[WANTED_HUD] = image('icons/mob/hud.dmi', src, "hudblank")
//hud_list[IMPLOYAL_HUD] = image('icons/mob/hud.dmi', src, "hudblank")
//hud_list[IMPCHEM_HUD] = image('icons/mob/hud.dmi', src, "hudblank")
//hud_list[IMPTRACK_HUD] = image('icons/mob/hud.dmi', src, "hudblank")
//hud_list[SPECIALROLE_HUD] = image('icons/mob/hud.dmi', src, "hudblank")
//hud_list[STATUS_HUD_OOC] = image('icons/mob/hud.dmi', src, "hudhealthy")
//hud_list[NATIONS_HUD] = image('icons/mob/hud.dmi', src, "hudblank")
..()
prev_gender = gender // Debug for plural genders
@@ -869,7 +858,6 @@
modified = 1
spawn()
//hud_updateflag |= 1 << WANTED_HUD
if(istype(usr,/mob/living/carbon/human))
//var/mob/living/carbon/human/U = usr
sec_hud_set_security_status()
@@ -92,7 +92,6 @@
take_overall_damage(amount, 0)
else
heal_overall_damage(-amount, 0)
//hud_updateflag |= 1 << HEALTH_HUD
/mob/living/carbon/human/adjustFireLoss(var/amount)
if(species && species.burn_mod)
@@ -101,7 +100,6 @@
take_overall_damage(0, amount)
else
heal_overall_damage(0, -amount)
//hud_updateflag |= 1 << HEALTH_HUD
/mob/living/carbon/human/proc/adjustBruteLossByPart(var/amount, var/organ_name, var/obj/damage_source = null)
if(species && species.brute_mod)
@@ -116,7 +114,6 @@
//if you don't want to heal robot organs, they you will have to check that yourself before using this proc.
O.heal_damage(-amount, 0, internal=0, robo_repair=(O.status & ORGAN_ROBOT))
//hud_updateflag |= 1 << HEALTH_HUD
/mob/living/carbon/human/proc/adjustFireLossByPart(var/amount, var/organ_name, var/obj/damage_source = null)
if(species && species.burn_mod)
@@ -131,7 +128,6 @@
//if you don't want to heal robot organs, they you will have to check that yourself before using this proc.
O.heal_damage(0, -amount, internal=0, robo_repair=(O.status & ORGAN_ROBOT))
//hud_updateflag |= 1 << HEALTH_HUD
/mob/living/carbon/human/Stun(amount)
..()
@@ -185,7 +181,6 @@
O.unmutate()
src << "<span class='notice'>Your [O.name] is shaped normally again.</span>"
//hud_updateflag |= 1 << HEALTH_HUD //what even is this shit
// Defined here solely to take species flags into account without having to recast at mob/living level.
/mob/living/carbon/human/getOxyLoss()
@@ -250,7 +245,6 @@
var/obj/item/organ/external/picked = pick(parts)
if(picked.heal_damage(brute,burn))
UpdateDamageIcon()
//hud_updateflag |= 1 << HEALTH_HUD
updatehealth()
//Damages ONE external organ, organ gets randomly selected from damagable ones.
@@ -263,7 +257,6 @@
var/obj/item/organ/external/picked = pick(parts)
if(picked.take_damage(brute,burn,sharp,edge))
UpdateDamageIcon()
//hud_updateflag |= 1 << HEALTH_HUD
updatehealth()
speech_problem_flag = 1
@@ -287,7 +280,6 @@
parts -= picked
updatehealth()
//hud_updateflag |= 1 << HEALTH_HUD
speech_problem_flag = 1
if(update)
UpdateDamageIcon()
@@ -312,7 +304,6 @@
parts -= picked
updatehealth()
//hud_updateflag |= 1 << HEALTH_HUD
if(update)
UpdateDamageIcon()
@@ -339,7 +330,6 @@ This function restores all organs.
if(istype(E, /obj/item/organ/external))
if(E.heal_damage(brute, burn))
UpdateDamageIcon()
//hud_updateflag |= 1 << HEALTH_HUD
else
return 0
@@ -413,5 +403,4 @@ This function restores all organs.
// Will set our damageoverlay icon to the next level, which will then be set back to the normal level the next mob.Life().
updatehealth()
hud_updateflag |= 1 << HEALTH_HUD
return 1
@@ -991,15 +991,6 @@ var/global/list/brutefireloss_overlays = list("1" = image("icon" = 'icons/mob/sc
/mob/living/carbon/human/handle_hud_icons()
species.handle_hud_icons(src)
///mob/living/carbon/human/handle_regular_hud_updates()
// if(hud_updateflag)
// handle_hud_list()
// if(..())
// if(hud_updateflag)
// handle_hud_list()
/mob/living/carbon/human/handle_random_events()
// Puke if toxloss is too high
if(!stat)
@@ -1261,184 +1252,6 @@ var/global/list/brutefireloss_overlays = list("1" = image("icon" = 'icons/mob/sc
*/
///mob/living/carbon/human/proc/handle_hud_list()
//
// if(hud_updateflag & 1 << HEALTH_HUD)
// var/image/holder = hud_list[HEALTH_HUD]
// if(stat == 2)
// holder.icon_state = "hudhealth-100" // X_X
// else
// holder.icon_state = "hud[RoundHealth(health)]"
//
// hud_list[HEALTH_HUD] = holder
//
//
// if(hud_updateflag & 1 << STATUS_HUD)
// var/foundVirus = 0
// for (var/ID in virus2)
// if (ID in virusDB)
// foundVirus = 1
// break
// var/image/holder = hud_list[STATUS_HUD]
// var/image/holder2 = hud_list[STATUS_HUD_OOC]
// if(stat == 2)
// holder.icon_state = "huddead"
// holder2.icon_state = "huddead"
// else if(status_flags & XENO_HOST)
// holder.icon_state = "hudxeno"
// holder2.icon_state = "hudxeno"
// else if(foundVirus)
// holder.icon_state = "hudill"
// else if(has_brain_worms())
// var/mob/living/simple_animal/borer/B = has_brain_worms()
// if(B.controlling)
// holder.icon_state = "hudbrainworm"
// else
// holder.icon_state = "hudhealthy"
// holder2.icon_state = "hudbrainworm"
// else
// holder.icon_state = "hudhealthy"
// if(virus2.len)
// holder2.icon_state = "hudill"
// else
// holder2.icon_state = "hudhealthy"
// hud_list[STATUS_HUD] = holder
// hud_list[STATUS_HUD_OOC] = holder2
//
// if(hud_updateflag & 1 << ID_HUD)
// var/image/holder = hud_list[ID_HUD]
// if(wear_id)
// var/obj/item/weapon/card/id/I = wear_id.GetID()
// if(I)
// holder.icon_state = "hud[ckey(I.GetJobName())]"
// else
// holder.icon_state = "hudunknown"
// else
// holder.icon_state = "hudunknown"
//
//
// hud_list[ID_HUD] = holder
//
//
// if(hud_updateflag & 1 << WANTED_HUD)
// var/image/holder = hud_list[WANTED_HUD]
// holder.icon_state = "hudblank"
// var/perpname = name
// if(wear_id)
// var/obj/item/weapon/card/id/I = wear_id.GetID()
// if(I)
// perpname = I.registered_name
// for(var/datum/data/record/E in data_core.general)
// 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*"))
// holder.icon_state = "hudwanted"
// break
// else if((R.fields["id"] == E.fields["id"]) && (R.fields["criminal"] == "Incarcerated"))
// holder.icon_state = "hudprisoner"
// break
// else if((R.fields["id"] == E.fields["id"]) && (R.fields["criminal"] == "Parolled"))
// holder.icon_state = "hudparolled"
// break
// else if((R.fields["id"] == E.fields["id"]) && (R.fields["criminal"] == "Released"))
// holder.icon_state = "hudreleased"
// break
/* hud_list[WANTED_HUD] = holder
if(hud_updateflag & 1 << IMPLOYAL_HUD || hud_updateflag & 1 << IMPCHEM_HUD || hud_updateflag & 1 << IMPTRACK_HUD)
var/image/holder1 = hud_list[IMPTRACK_HUD]
var/image/holder2 = hud_list[IMPLOYAL_HUD]
var/image/holder3 = hud_list[IMPCHEM_HUD]
holder1.icon_state = "hudblank"
holder2.icon_state = "hudblank"
holder3.icon_state = "hudblank"
for(var/obj/item/weapon/implant/I in src)
if(I.implanted)
if(istype(I,/obj/item/weapon/implant/tracking))
holder1.icon_state = "hud_imp_tracking"
if(istype(I,/obj/item/weapon/implant/loyalty))
holder2.icon_state = "hud_imp_loyal"
if(istype(I,/obj/item/weapon/implant/chem))
holder3.icon_state = "hud_imp_chem"
hud_list[IMPTRACK_HUD] = holder1
hud_list[IMPLOYAL_HUD] = holder2
hud_list[IMPCHEM_HUD] = holder3
if(hud_updateflag & 1 << SPECIALROLE_HUD)
var/image/holder = hud_list[SPECIALROLE_HUD]
holder.icon_state = "hudblank"
if(mind)
switch(mind.special_role)
if("traitor","Syndicate")
holder.icon_state = "hudsyndicate"
if("Revolutionary")
holder.icon_state = "hudrevolutionary"
if("Head Revolutionary")
holder.icon_state = "hudheadrevolutionary"
if("Cultist")
holder.icon_state = "hudcultist"
if("Changeling")
holder.icon_state = "hudchangeling"
if("Wizard","Fake Wizard")
holder.icon_state = "hudwizard"
if("Death Commando")
holder.icon_state = "huddeathsquad"
if("Ninja")
holder.icon_state = "hudninja"
if("Vampire") // TODO: Check this
holder.icon_state = "hudvampire"
if("VampThrall")
holder.icon_state = "hudvampthrall"
if("head_loyalist")
holder.icon_state = "loyalist"
if("loyalist")
holder.icon_state = "loyalist"
if("head_mutineer")
holder.icon_state = "mutineer"
if("mutineer")
holder.icon_state = "mutineer"
if("Shadowling")
holder.icon_state = "hudshadowling"
if("shadowling thrall")
holder.icon_state = "hudshadowlingthrall"
hud_list[SPECIALROLE_HUD] = holder
if(hud_updateflag & 1 << NATIONS_HUD)
var/image/holder = hud_list[NATIONS_HUD]
holder.icon_state = "hudblank"
if(mind && mind.nation)
switch(mind.nation.default_name)
if("Atmosia")
holder.icon_state = "hudatmosia"
if("Brigston")
holder.icon_state = "hudbrigston"
if("Cargonia")
holder.icon_state = "hudcargonia"
if("People's Republic of Commandzakstan")
holder.icon_state = "hudcommand"
if("Servicion")
holder.icon_state = "hudservice"
if("Medistan")
holder.icon_state = "hudmedistan"
if("Scientopia")
holder.icon_state = "hudscientopia"
hud_list[NATIONS_HUD] = holder
hud_updateflag = 0
*/
/mob/living/carbon/human/handle_silent()
if(..())
speech_problem_flag = 1
@@ -571,9 +571,6 @@ var/global/list/damage_icon_parts = list()
else
overlays_standing[ID_LAYER] = null
hud_updateflag |= 1 << ID_HUD
hud_updateflag |= 1 << WANTED_HUD
if(update_icons) update_icons()
/mob/living/carbon/human/update_inv_gloves(var/update_icons=1)
-4
View File
@@ -314,8 +314,6 @@
for(var/datum/reagent/R in C.reagents.reagent_list)
C.reagents.clear_reagents()
C.reagents.addiction_list.Cut()
hud_updateflag |= 1 << HEALTH_HUD
hud_updateflag |= 1 << STATUS_HUD
/mob/living/proc/update_revive() // handles revival through other means than cloning or adminbus (defib, IPC repair)
stat = CONSCIOUS
@@ -381,8 +379,6 @@
stat = CONSCIOUS
update_fire()
regenerate_icons()
hud_updateflag |= 1 << HEALTH_HUD
hud_updateflag |= 1 << STATUS_HUD
return
/mob/living/proc/UpdateDamageIcon()
@@ -5,7 +5,6 @@
var/maxHealth = 100 //Maximum health that should be possible.
var/health = 100 //A mob's health
var/hud_updateflag = 0
//Damage related vars, NOTE: THESE SHOULD ONLY BE MODIFIED BY PROCS
var/bruteloss = 0.0 //Brutal damage caused by brute force (punching, being clubbed by a toolbox ect... this also accounts for pressure damage)
-10
View File
@@ -177,16 +177,6 @@ var/list/ai_verbs_default = list(
new /obj/machinery/ai_powersupply(src)
//hud_list[HEALTH_HUD] = image('icons/mob/hud.dmi', src, "hudblank")
//hud_list[STATUS_HUD] = image('icons/mob/hud.dmi', src, "hudblank")
//hud_list[ID_HUD] = image('icons/mob/hud.dmi', src, "hudblank")
//hud_list[WANTED_HUD] = image('icons/mob/hud.dmi', src, "hudblank")
//hud_list[IMPLOYAL_HUD] = image('icons/mob/hud.dmi', src, "hudblank")
//hud_list[IMPCHEM_HUD] = image('icons/mob/hud.dmi', src, "hudblank")
//hud_list[IMPTRACK_HUD] = image('icons/mob/hud.dmi', src, "hudblank")
//hud_list[SPECIALROLE_HUD] = image('icons/mob/hud.dmi', src, "hudblank")
//hud_list[NATIONS_HUD] = image('icons/mob/hud.dmi', src, "hudblank")
ai_list += src
..()
return
@@ -145,13 +145,6 @@
theAPC = null
process_queued_alarms()
//regular_hud_updates()
//switch(sensor_mode)
/// if (SEC_HUD)
// process_sec_hud(src, 1, eyeobj)
// if (MED_HUD)
// process_med_hud(src, 1, eyeobj)
if(get_nations_mode())
process_nations_ai()
@@ -143,15 +143,6 @@ var/list/robot_verbs_default = list(
cell_component.wrapped = cell
cell_component.installed = 1
//hud_list[HEALTH_HUD] = image('icons/mob/hud.dmi', src, "hudblank")
//hud_list[STATUS_HUD] = image('icons/mob/hud.dmi', src, "hudhealth100")
//hud_list[ID_HUD] = image('icons/mob/hud.dmi', src, "hudblank")
//hud_list[WANTED_HUD] = image('icons/mob/hud.dmi', src, "hudblank")
//hud_list[IMPLOYAL_HUD] = image('icons/mob/hud.dmi', src, "hudblank")
//hud_list[IMPCHEM_HUD] = image('icons/mob/hud.dmi', src, "hudblank")
//hud_list[IMPTRACK_HUD] = image('icons/mob/hud.dmi', src, "hudblank")
//hud_list[SPECIALROLE_HUD] = image('icons/mob/hud.dmi', src, "hudblank")
//hud_list[NATIONS_HUD] = image('icons/mob/hud.dmi', src, "hudblank")
diag_hud_set_borgcell()
scanner.Grant(src)