From b081891dc65a04365e19d5f69dabf6d25af35512 Mon Sep 17 00:00:00 2001 From: Regalis11 Date: Wed, 24 Feb 2016 19:44:15 +0200 Subject: [PATCH] Cam twitching fix? (untested) --- .vs/Subsurface_Solution/v14/.suo | Bin 783360 -> 783360 bytes Subsurface/Source/Characters/AICharacter.cs | 26 +++++++++----------- Subsurface/Source/Map/SubmarineBody.cs | 2 +- 3 files changed, 13 insertions(+), 15 deletions(-) diff --git a/.vs/Subsurface_Solution/v14/.suo b/.vs/Subsurface_Solution/v14/.suo index ed6b500123b5ba500aa295eeb895aaa634c6dab4..195ff13d26d5c6440664ad902ca3ae7e4082f9ff 100644 GIT binary patch delta 2112 zcmb`Gdr(wW9LM+E``hL2f`EVvE}P!gD`8=*Mm{%OlhRQGEbSpoLQ;c>8HA27Xlw1* zjAI2{+T%de5HTy&J?k!8B<()1CRu?|07m zo!|3Z-(b3LFuf*sd@eJYHiB!G{{XOa5$=;W7HVO0Rq!7`8mmI5RETaYh;azh`H-P&<3fKbH!8jk%1dIUDPzm}| zzy=-%zrbc2WEpr4JOb{;-e$;!;7Q!EfdK#)Bi|~Vmr8m=j3Z?nOzJ@uSOU%iEAWCc zm=!}#l=QD+9Ex$(gBI&UF{z$gjlwWABi#Qm3KijRcN9kW+Z@G||1b(YGsf=yd*`5hcF+sgPM!jXvWf=a|bIC)YpU2xs_vN`lu6cc|F59JRjm}VJQqP^uaS|`D zRWd>up5yE4>`hXlq&M4l(nuV4qT6hSuZQ$!6LZM;N%YP{kIjj(NZ4*79rwQPm>tm_HiUs9_|m&Cran zuQ7gD(7f<~q)NO=ArhKGy)1l2QcH!}Ax~lY0ci%W_(;yNG9!MrY%=lgMbZSlAU=Ma z7HKlIp?Kpf=H1trmp2`;M2no2^1elN?HAZEzt}D}j@E0W6l{=_jJ69`ztqQcp9@;A z+{f4rzJ0H}KzPIQz|@fIS|1Dc$!XzyQYF3Vd1Mtuy%D_2K{I*m32U_Q)=?MZzV(zV za_!W{!U>cqad#Vw6S)qod6(Thhu0jpD8lQ9Y3+8Wa89DrGJiQ$u?u^j`78_D;GL_d z7~H2&uQkviYg{`>8s&^FQdAtIU5J&*yuv$^x*~&JBn7?X;NG=V#M|DtIfXBid@Ptx zj)0qT*_V8UMw6{;@FI+s6^crYX0xc+-`B<--#?X#^rm=(-hzJXJ!x?wZX2Cr{8Bxe zBqmkU079OSG@y0*tc%X?6uwXqAZ!c1o^W{U-8T(4|`HA10T($m8VBA@E zNBvx0n9mY;>M)%OBoT(yKz-)X0q!P@Z9ivg>0MrM$l?$mH`9YwzHlMk!TS@fPBC{i z9bv(}WZ_bt#mNgA6emA>(H6xEnBs_usB*V`m-4CK{=~q!vUrUbE|DkH)&^SbCJgn5JSY5ha}zh~PdKp(!qEVbnFY1!fJkzNuH{O%twWye;mlVlecW zhnP?gQ@?!E(Y(rn$H~FMqotHwwI+zpW3+_vXWoz!c)~0>O?U^X%N*ED8)B;lD;p2p zXjodk=0oARn#M=^BWgF(Mi#t4Q7pjO*Hp$G!%70LUarK6-Djwn-DKNu_FMcBe#LL~ J+gc(o{|2Nlb147- delta 2110 zcmb`Idr(wW9LM+E``cyjg1iKzWz!2TM1`^%Q<{XUP+FKgd`yaC&|rh6CIk#27S51O z4mH5FJ*GWqan?uWth>w}{%{I#O7qccoQWES*|ago%*aPI4np6%I=16z^+$K+Gr#lu zo!>dX-~FC*cbm^DCzpNzF;@7b!Vaf$EFir>eV>y9o;0od;uzC@F)g+AfAV>Fq#@s~s_knpB z?*X9_<>12lkqNz02% za_V&~aF>EVk)r#0{b%7n38o_UFzj$%$hulYf|*R7h@puPX7dHTO< z9_rf}m*CVdSh(u>@b9F$5nbI*^~`Y9mtg~4^;}%-aMeQ<2V;_@b&~)0I16=nI;AFq z=Jsr*NTh3y-43H(xI$aCyNDh|i1&QXs{CqlFtwvB&7YPu#CT1+Ime%qdwjJoUX}dn zo}l7#OT+Z8o_*OZZKv;WNqAeAR1o?!`9PPH>FZV>6Y8KGWG*wQesv_c$<@zPp`K?! z#t)n@rErJek|461*w=-wDzf|SS4WsokFwymu3ia={e(p6{fI`ObM1QJy z-&N-1org`)qG+*vAU{;(B^qL$9ddHOEw!?n@3tW{S1PA6nH9;rXs?{EIV6SGE|QD1 zL(;Ty_DF-ldwpNS7~i~Ko-LdK`Bb_{>qgg}Avr5xCsooq*ORbE(O^U%nerq)TwqDy zUY|KylqXRqbCnX_a|2r77fH$E4lj!r#a8mNu%mkj%7>0lKieHNQ&UQW%-<0PwV zknZNe35re3{E!Ya&kBSt(7M>Jl1r7+iEj#9;#d8Y)kwV2_?3-MTs}MsfKx)NYeVV z;zfKTU0|MOA|B(BV@0fuhMCqpYS%nDR*|=b`XgOSX*!QRsYDBB0`)S_Hlhw6bnB!+ zre9NG-$8>$UQuM4%tv=xtm2UlI>gvP-j_*Ty!=y>RebEGxe9kaPT{BL*-xfhR|OiG zlTo$)@f2)i4N*o&T?4NWmLJ*3X6RR-SQPh=H^P%g(vACbmAKtOc3K#IilWv*t$3G0 zi1Zl^$t-Zaqcwjh38Lo=&1atDWMwYimq=w?Jspw6t=G&6ylH_sUThzsD#qXYiYZ!F zx5DEel&1>kS?V?ZQ@&>y=j*F9FW?KdQ%|gE@3BP#n~$cR`=Zg^Ik$9W=;(OnTQm@O jiWM+3-YfLCeDh1>waZv*i?PMj647FAQCcj!A}{|1w!?P` diff --git a/Subsurface/Source/Characters/AICharacter.cs b/Subsurface/Source/Characters/AICharacter.cs index 0da4ed91f..f1a8c3c1d 100644 --- a/Subsurface/Source/Characters/AICharacter.cs +++ b/Subsurface/Source/Characters/AICharacter.cs @@ -148,8 +148,11 @@ namespace Barotrauma rotation = message.ReadFloat(); } - catch + catch (Exception e) { +#if DEBUG + DebugConsole.ThrowError("Failed to read AICharacter update message", e); +#endif return; } @@ -186,15 +189,11 @@ namespace Barotrauma aiController.ReadNetworkData(message); return; case NetworkEventType.EntityUpdate: - Vector2 targetMovement = Vector2.Zero; - bool targetDir = false; - if (sendingTime <= LastNetworkUpdate) return; - bool inSub = false; - - Vector2 pos = Vector2.Zero, vel = Vector2.Zero; - + Vector2 targetMovement = Vector2.Zero, pos = Vector2.Zero; + bool targetDir = false,inSub = false; + try { targetDir = message.ReadBoolean(); @@ -204,14 +203,13 @@ namespace Barotrauma inSub = message.ReadBoolean(); pos.X = message.ReadFloat(); - pos.Y = message.ReadFloat(); - - //vel.X = message.ReadFloat(); - //vel.Y = message.ReadFloat(); - + pos.Y = message.ReadFloat(); } - catch + catch (Exception e) { +#if DEBUG + DebugConsole.ThrowError("Failed to read AICharacter update message", e); +#endif return; } diff --git a/Subsurface/Source/Map/SubmarineBody.cs b/Subsurface/Source/Map/SubmarineBody.cs index e08eae115..7e45546b9 100644 --- a/Subsurface/Source/Map/SubmarineBody.cs +++ b/Subsurface/Source/Map/SubmarineBody.cs @@ -232,6 +232,7 @@ namespace Barotrauma if (Character.Controlled != null) Character.Controlled.CursorPosition += displayerMoveAmount; GameMain.GameScreen.Cam.Position += displayerMoveAmount; + GameMain.GameScreen.Cam.UpdateTransform(); targetPosition = null; } else if (dist > 50.0f) @@ -494,7 +495,6 @@ namespace Barotrauma } Explosion.RangedStructureDamage(ConvertUnits.ToDisplayUnits(lastContactPoint), impact * 50.0f, impact * DamageMultiplier); - } }