Merge pull request #33881 from AnturK/walls-have-eyes

Makes reset_perspective handle turf as eye
This commit is contained in:
Leo
2017-12-28 19:02:30 -02:00
committed by CitadelStationBot
parent 0d79434b72
commit 868fbec32d
2 changed files with 5 additions and 5 deletions

View File

@@ -21,8 +21,8 @@ SUBSYSTEM_DEF(parallax)
return
continue
var/atom/movable/A = C.eye
if(!A)
return
if(!istype(A))
continue
for (A; isloc(A.loc) && !isturf(A.loc); A = A.loc);
if(A != C.movingmob)

View File

@@ -260,13 +260,13 @@
client.perspective = EYE_PERSPECTIVE
client.eye = A
else
if(isturf(loc))
if(isturf(loc) && (!A || loc == A))
client.eye = client.mob
client.perspective = MOB_PERSPECTIVE
else
client.perspective = EYE_PERSPECTIVE
client.eye = loc
return 1
client.eye = A
return 1
/mob/living/reset_perspective(atom/A)
if(..())