From 71faada355ca6ddca7088521ec4c0143e138a4b6 Mon Sep 17 00:00:00 2001
From: Regalis <regalis@undertowgames.com>
Date: Mon, 25 Jan 2016 18:56:29 +0200
Subject: [PATCH] Setting camera position correctly when switching to map
 screen with no character selected (spectating, etc)

---
 Subsurface/Source/Screens/GameScreen.cs |   2 +-
 Subsurface_Solution.v12.suo             | Bin 811520 -> 811520 bytes
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/Subsurface/Source/Screens/GameScreen.cs b/Subsurface/Source/Screens/GameScreen.cs
index 5883d0642..e54479557 100644
--- a/Subsurface/Source/Screens/GameScreen.cs
+++ b/Subsurface/Source/Screens/GameScreen.cs
@@ -45,7 +45,7 @@ namespace Barotrauma
             }
             else if (Submarine.Loaded != null)
             {
-                cam.Position = Submarine.Loaded.Position;
+                cam.Position = Submarine.Loaded.WorldPosition;
             }
 
 
diff --git a/Subsurface_Solution.v12.suo b/Subsurface_Solution.v12.suo
index a8e7a3550a6257e90058a6adfd7817aee9f09ab8..2cfe323d17c968cdabb781dd352bfb7414cbec41 100644
GIT binary patch
delta 501
zcmX9(O=uHg5Z(9fmt-5Y7E_~AjZ0WiFoLN?O3g_GFNJDR2$D)o3u>d#g298J3*zF%
z(y+MGLjsBtJXRz91U-o4rUwr}dx)W}Rq$W-VpU3=Z67@5@y*P8^V#*ZT~ALPfGDNA
zw&<Fs8O&|aw0~R=iqe@lijRuFLm_+g{>`b{MEIwWtBl%cTf>n1gr>Qf_GPyxHoW%i
zPH*mA6E_+$)rcV#b?pmQ&3fDf*~f&XEECOlUILdfNyP;A7=c*;dXPX$UgBhGEQx;c
z1eE+JTGhWe<SiqI6*Y8HKL@J+LB{D8v)wv+6~15<o&ol~s5ig5c2`m*U!w)r?qhXY
zwl;ZXq;Q4ymvLR5;B#rFjGgfnPINe{!o0^n-O8OoL5pSNjZ>^Ag3100ddM#5M|VsI
zXYtq~Ggu86XI-GPSs9~W6?DvwNwZIx$Mppe=EM;)_l7sp@QBfwcqJ#7DsK;ezdA7R
zZ1?T=w|G%wgLUNBr{8>ww3GcbVz@6pN7aWxeHW?^Wd`FxJ4-X2#&#OHCM|U*A1%Pk
z>83J2$@x&}t|a+VKIf|HS($?}f5>@M&r9L>((yx%A9nnR;~S3O=J?U7zhV48%k#l!

delta 456
zcmYk1O=uHw5XJv9JDYAJe$b@t!9drLL&-+iM37Q)>!CdeRq3HfkzCatEUcG8H6ZLk
z`^lCakQ93eOAEH3Le`_=9z0aggXp11k?KJM!dfs2HBKmkhab!gZ{C}!M#XAWT(&{2
z6i@enQYs;AN--n6Rx4Ngpz`?EPhDRg`0!xq=}h7~dKG>BNpi@@9Jbr-tjJoj;tLOj
zIYGv4Z{oyryo6p~>bAFfa`J976*g0lPWt;;=XwhYaL8}>ag;h@&V0u5Q8o1o>Rdeo
zxiDwK?t9<HDJqF4S8Q~kKYVAS1;KAPA1rF<matLMV2Ggx7M$a=HMk?bTQwM<8*&)G
zsexl$My19&-Gw#C9HmTOqe+g|pzJ>)Nt)Jnzxips6}Fl*2%&j}_KpWTgpKQD4zrnu
zLGM+%z)l_}=$^RoixKSg_Igu%kcV-8X+e=43od$5+U5fb3T$p`Ipe-a7yg%r&bBrW
z!3LEZJCwyR`-ML0jb{{rVat!FI)DDNPF6{&ub<>@75@1_h`}tP8<QLBZk%xAE;lyZ
MxZ91BL454yUsLR$9{>OV