Fixed nulls in the active_alternate_appearances list (#568)

2017-04-26 10:11:22 -05:00
parent f881683902
commit 4cf23d086a
3 changed files with 39 additions and 0 deletions
@@ -0,0 +1,10 @@
+diff a/code/datums/hud.dm b/code/datums/hud.dm	(rejected hunks)
+@@ -80,7 +80,7 @@ GLOBAL_LIST_INIT(huds, list(
+ 			gang_huds += G.ganghud
+ 
+ 	for(var/datum/atom_hud/hud in (GLOB.huds|gang_huds|GLOB.active_alternate_appearances))
+-		if(hud.hudusers[src])
+		if(hud && hud.hudusers[src])
+ 			hud.add_hud_to(src)
+ 
+ /mob/dead/new_player/reload_huds()
@@ -0,0 +1,19 @@
+diff a/code/game/alternate_appearance.dm b/code/game/alternate_appearance.dm	(rejected hunks)
+@@ -29,12 +29,11 @@ GLOBAL_LIST_EMPTY(active_alternate_appearances)
+ 	appearance_key = key
+ 
+ /datum/atom_hud/alternate_appearance/Destroy()
+-	if(!QDELETED(src))
+-		for(var/v in hudusers)
+-			remove_hud_from(v)
+-		for(var/v in hudatoms)
+-			remove_from_hud(v)
+-		GLOB.active_alternate_appearances -= src
+	for(var/v in hudusers)
+		remove_hud_from(v)
+	for(var/v in hudatoms)
+		remove_from_hud(v)
+	GLOB.active_alternate_appearances -= src
+ 	return ..()
+ 
+ /datum/atom_hud/alternate_appearance/proc/onNewMob(mob/M)
@@ -0,0 +1,10 @@
+diff a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm	(rejected hunks)
+@@ -29,6 +29,8 @@
+ 	prepare_huds()
+ 	can_ride_typecache = typecacheof(can_ride_typecache)
+ 	for(var/v in GLOB.active_alternate_appearances)
+		if(!v)
+			continue
+ 		var/datum/atom_hud/alternate_appearance/AA = v
+ 		AA.onNewMob(src)
+ 	..()