From beecfe60ac97fd5d11ef142834b88e9dbc380378 Mon Sep 17 00:00:00 2001 From: Regalis Date: Sun, 6 Dec 2015 16:36:24 +0200 Subject: [PATCH] mhgvik --- .../AI/Objectives/AIObjectiveIdle.cs | 5 +++++ Subsurface/Source/Items/Components/Door.cs | 2 +- Subsurface/Source/Map/SubmarineBody.cs | 16 +++++++++++++--- Subsurface_Solution.v12.suo | Bin 810496 -> 810496 bytes 4 files changed, 19 insertions(+), 4 deletions(-) diff --git a/Subsurface/Source/Characters/AI/Objectives/AIObjectiveIdle.cs b/Subsurface/Source/Characters/AI/Objectives/AIObjectiveIdle.cs index 0e9d9ea34..9bd5f267f 100644 --- a/Subsurface/Source/Characters/AI/Objectives/AIObjectiveIdle.cs +++ b/Subsurface/Source/Characters/AI/Objectives/AIObjectiveIdle.cs @@ -31,6 +31,11 @@ namespace Barotrauma var pathSteering = character.AIController.SteeringManager as IndoorsSteeringManager; + if (pathSteering==null) + { + return; + } + if (newTargetTimer <= 0.0f) { currentTarget = FindRandomTarget(); diff --git a/Subsurface/Source/Items/Components/Door.cs b/Subsurface/Source/Items/Components/Door.cs index 1bacc26f9..6933fb1cc 100644 --- a/Subsurface/Source/Items/Components/Door.cs +++ b/Subsurface/Source/Items/Components/Door.cs @@ -317,7 +317,7 @@ namespace Barotrauma.Items.Components return; } - Vector2 pos = new Vector2(item.Rect.Center.X, -item.Rect.Y); + Vector2 pos = new Vector2(item.Rect.Center.X, item.Rect.Y); if (item.Submarine != null) pos += item.Submarine.Position; pos.Y = -pos.Y; diff --git a/Subsurface/Source/Map/SubmarineBody.cs b/Subsurface/Source/Map/SubmarineBody.cs index 0320806bf..4c5b32f16 100644 --- a/Subsurface/Source/Map/SubmarineBody.cs +++ b/Subsurface/Source/Map/SubmarineBody.cs @@ -389,9 +389,19 @@ namespace Barotrauma Limb limb = f2.Body.UserData as Limb; if (limb!=null && limb.character.Submarine==null) { - var ragdoll = limb.character.AnimController; - ragdoll.SetPosition(ragdoll.RefLimb.Position - body.Position); - limb.character.Submarine = submarine; + Vector2 normal2; + FixedArray2 points; + contact.GetWorldManifold(out normal2, out points); + + if (Submarine.PickBody(points[0] - ConvertUnits.ToSimUnits(submarine.Position), points[0] - ConvertUnits.ToSimUnits(submarine.Position) - normal2, null, Physics.CollisionWall) != null) + { + return true; + } + + return false; + //var ragdoll = limb.character.AnimController; + //ragdoll.SetPosition(ragdoll.RefLimb.Position - body.Position); + //limb.character.Submarine = submarine; } return true; diff --git a/Subsurface_Solution.v12.suo b/Subsurface_Solution.v12.suo index aa21a3b5c1cbf1de53a6be1e892a25ac8ce8f3b8..ba8cfe073c394c80a55ddf98e84108da6e351715 100644 GIT binary patch delta 8618 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 NPZ#k0Y)n9l{V(&n-q-*D delta 7577 zcmcIp4O~=5lArF^@6G$*V?Z1M5l1p2Dw1(T#E+N}34R34gb*|?YY;@yAVCD9#^6X? zFPC*a!ZTBvbt4k@=^EFd652Da8ClnLHM(eAFHz1TT#_}$7|*C{Ow_A4s8KhY+xvRI z-=FHP?&_+ps_uI8@a-Px+dZ(>HNkTGu~{rnQ;Q`U`!{ahylJutLPeMz4Lf6Td?}&= zF&8lpQHiKROhn{vd*MqW)gD?tdt-`TL2Jme9ha#_Mm>+R*Ky6;kJViB)??}#in3|Q zGv~x3%|(PhqVuUfUmhQtf{RT==0!xRewY=pG04$V#TE1>(OX1!$QWF1 zJ&x{0)X`F@e#GPV8dN9C5w~p;aZ=C*Jx1mXb_!F^_4~TC>f{iKV$P4`XKgdFa_)=IqlYn8{6g#^LZa7I$Jkyes&k1 z!L|{kJLJ2hsKk7fUx2a;5sMJdBNiiGKvW}^AbgbH7)PAbdBPETnm|U9dOr4e+2rJrNnV4AWg9W2u$u zi$eObPjFn{6p}PJJy$e}3qg2{4(rqh47=u<*dl1*<#p=cxWU5H(XYuGPBe1lko zSdROdfU2HFV3Uv!TTW32IRS@H z(Ff7Z*JG&Q^heVLv_gVK(R93QZhkNd-?Q(axvs6V?&D9=NlXwhac~ zVd~?)fZ!u!Dv)2%VbHjMI{DKF=w71NKgqbW5*Gwtn;HKVm=s1BrKAD&I@m&(7?7jD z5uw=mhE|%dG+!mNh%LVByqW*J{4Z;}9QTs#|E+9x{E4M`I)dn_YJ}wT%)J0{zleB3km$k7ef5D`eb4- z!QEWPDhYj#!hD^*Y@`cn^K@24!t)>M-Q4mqOH@nyrVz9zbmXMW;2aUAr8!Fe9(U3a5!lK(uMs5TCX#e*RG^viS3c$i65@q zx=@=LoBQF;OKU%ak0fTN6_(}?1c!|~#$xR<&I)$j*N*9Rj5!H=02O|B4l3VgEBu)R z%N%9x;;j^4V5XtUB>!eMTCwy&fqwT2ZDwBBH-nAvzsWM?zBp#SF5b21n{0&<$(X;M zRnnmv%&%vM6=M1>#j*@WEv9pL*(z42-F2rK4NNvK5c1fz zrH>LAxSBZO!YWLs%q^^(kzAAOuVj~q1eYt>66p}$>Pe5mBF+|R;(aluQAL({mj0VZ zy!LTp+h*a{SDy2Ix+goB(7azZJ3;F5Fo$=txG?W4xXkU>m{r(*72!v0MXW)fi*CM# z^yi4Rh+iOHN328CBW}ySf$d)+p!OIa~S+Jo!6D%+vhp#et|fT_!1EV(;8X-SL&mUlZ-XL z$1VxvU-{)fGL1F|*cK9JnlT4c)}$uNZ?!9s!hyXk9j^xF|A5I{-p8(z=9BD#HSG4} zoA?7!(Ddr|MDw_}k>wvV<6|+qxr5<#!dz0RWaf`9^7$_53YFXNh?t_ha*(tls(HLb zC19aq2G9JK?G~Wsur-QD={$XbbU=g_L5zki-!La15h?Bypyj+Z4_fooSYBQu z)e^&w!-Yvo8WaRX8>FOS?W_N@mGP--r3UhLi#Sp+CQGzg7F!s&A5o%V&nMOp?%X7` z5#ACaQu)J)VueoliI~l^UlyBYLe5MHYkHa07XhB}5`#~l6O&+K zytETqr;5qk_LX=c1QLEBI-&jeD2VVx{cwS*x zR}yfz(D@%o(sW*3Eyfdnyx8DhCC2j1SZTKi9YbUcMWgkcU^pZS#}-=?K&_S|d1|xu zJpzHR7~?EKiW9)`j*8096nU|5~d{=Ce1;|Z&mK+X(hGL%0m*?HM_^?Eb;NX%2=l_$P8AEm-Bi4d3gi+Cq_=;DVOA90u+vw(;#q3 zIlymRlc@;qT~<5fZ_*NY`c?S=1~Ex;Lw&O1_V<_B+a=0s(##Y}VMC%639c^`H@Nzu z55`jk_vpB4jRH?U$;O?M(kAK|{USklhq!n~n6d{Aa+zvFlw-K%CsjPgHU*FI#Rdgm zfWKB4kB(K&U~EqjJ9vho+fQ4Q;lfsV1TQJTZGsQaA7?Ks--?hiTb%)|Bh)xvQ>Rq-G-?%UG${-cn&e!b zyIt8r^orwYJZ+b9Fa~N8%{Ta+3jVZgEmkJNVnDvr+F2aaasS%AV$5c5Q&Ur$jVB#Dl9lTfY;yO~LMDds6)CE?(;lq)9 zWTM(a!2N4^Dug%Dc)r-FE+cRtMNNV7d`SY^A!`E9OHw!EU705*^JKS*H|Vif<$SPJ zD{j8hrB)KWT%|;CmEh(wQ`OzwVf#8I6}(AO2>0Zu0gT!NX&8(=jq&n&)kXpZGo^~o zN?ez#mPJ6vK^cEPm#D2VQ1`Zk&Yz*4C&n^W26qykgW71t#)s9Y`!SLSl`NjMLfu86 zE=SIUMiJ9&My>i8&oXDbn?W>GBjqX zGSA$t?k3Q3RgHqiqiQxUXjSWpUiZ{w@OGtPrb8Wk`4M#yf%YN^6FNst;vrfX9kWhr#RU0BYVC#G}1frUhJg9EQTb6#L-hiUX zB2TnwCpG^|8kU)O%}1c&5?0;BIPD~6e5>pS*EThU?{jGNl(rJAT(My@7=9GSvWD*< zswGRGn`MU!?^@${ptt6s&AU_|3FF^C1p@D=9(dX(DrPGRdhAhi1Y&W4YoX+Tr%kWU z-J|XlWDC~Evv>qN@2V3h$qIJBJ5ZY*TGpvJ_=P&f)ZOC=%d?hJOO>V4G7DQ}mK1!o zD@BUtS%NdV{f!y0_P1)D=)!L;1K{Rw)k)ylhc=!4yP{cz8l0LoB=v=#!}@R4Xo9~c!i9&8{pf$UMvZhW1g>3GlVI12T9z4`6am(M zqxP{@R#X*LR#m_&leA%%;$p%x! zd{#PZPGN9SvMH!Dyu4)Lyjex_@^4XS{YHI|{3198feww)k}BBtq&5K7d?SRBA2yU} zmdyLj?5`=KgEprW&Fc%>CTP8GZGlYFV!9UG_ORvZyOr4Pj>rt|H!Ngy$+U`TMU}-B zC^-arP0>;z^(igJJ^|k+J0E+X5ZghSA2uvJbPU??M9{ss+F&?3NpnPY_UGk)HwLCr zcJJ-=E$#0XV>=X)`8_UCtYfQ6OL4vaa5P?X1l`3-kkz@&8@F@G!U8SWPB52QXXN4` zedUHaHyEb}^R;-G@?-5$yZPz0^N9@a)li?f^G{5zikfv2#cAUfmx z3}D_3)RZU6D`r&|<2rqV>qzs0{h%8nj@^>ASRM$N|G?=F-VUwmp5%m_JeFd*Pn2(+ zl;Td=?svA;{_a3*N0_pWQkkjBb;s#8Nc%*y+q3T|vImN=ZGKb8H11?_XfU;5Pk|PB zM>5E>0-L7U;io^+LXyUzOgBUb;&wo89eHiiw1wVhXO&f=?gxVj1Q!Z4Cf{ZUE$+JG zj>VC|K$u|+F>i@(_*pDeoQl3%3P;0*?$~7z7_3DF|6ot%V?Wh)iiTe!@VKP)dbM1W zAbF~$NqBQq6jugMZHST^?4S+9ieY`Y))Uq}qD8>EPqf}KsLEmsY{$RmHtyO2>}?Yt zu->u^*8f=>0wX`g)t3#{yx{#(NXDNST2OyFF-q|5bkz`iU2*(giH9w^wh98Ff(JZA z3vBfLS)-)<&KEbVX8(e}k&4DLC%j6vXP|zFf-?mz;Gdy+U~hNU4^Ced>>GWOCg?eB z9x@yD9uP91sZ>k{tV)mQb!|0J_CCJ&`9V8tRwMAO)_l$XsQD{mQ^ag9o(5Bpc( zdY(1fKG?TL8?n*zGmZAfQq%cFTL=cr{3pz-AdUP{`S@oHKWP9JjdF$?~Dcd94_ZyGc@T7d&uYqk^8>76@9* z(c&`tom&UWg9(FCm$iq%y%yuT>atd9bZ802Nh}SUwUp-kkN`37E?62PKh&HZ5*Nnf JGDAL&`A-&|Xq5l}