Merge pull request #37943 from AutomaticFrenzy/patch/mind-over-matter

Fix mindswap forcibly enabling ambient occlusion
This commit is contained in:
Jordan Brown
2018-05-21 17:31:02 -04:00
committed by letterjay
parent 6489ef5511
commit 1766134062
3 changed files with 5 additions and 4 deletions
+3 -1
View File
@@ -196,7 +196,9 @@
screenmob.client.screen -= infodisplay
for(var/thing in plane_masters)
screenmob.client.screen += plane_masters[thing]
var/obj/screen/plane_master/PM = plane_masters[thing]
PM.backdrop(screenmob)
screenmob.client.screen += PM
hud_version = display_hud_version
persistent_inventory_update(screenmob)
+1
View File
@@ -29,6 +29,7 @@
blend_mode = BLEND_OVERLAY
/obj/screen/plane_master/game_world/backdrop(mob/mymob)
filters = list()
if(istype(mymob) && mymob.client && mymob.client.prefs && mymob.client.prefs.ambientocclusion)
filters += AMBIENT_OCCLUSION
+1 -3
View File
@@ -1537,9 +1537,7 @@ GLOBAL_LIST_EMPTY(preferences_datums)
ambientocclusion = !ambientocclusion
if(parent && parent.screen && parent.screen.len)
var/obj/screen/plane_master/game_world/PM = locate(/obj/screen/plane_master/game_world) in parent.screen
PM.filters -= AMBIENT_OCCLUSION
if(ambientocclusion)
PM.filters += AMBIENT_OCCLUSION
PM.backdrop(parent.mob)
if("save")
save_preferences()