From dd0060612aea80e7d7f3e18495d212f3b14495fa Mon Sep 17 00:00:00 2001 From: MysterD Date: Tue, 18 Apr 2023 20:45:33 -0700 Subject: [PATCH] Another attempt at connection issue fix --- lib/coopnet/linux/libcoopnet.a | Bin 3807206 -> 3807206 bytes src/game/behaviors/chain_chomp.inc.c | 2 +- src/pc/network/packets/packet_reliable.c | 2 ++ 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/coopnet/linux/libcoopnet.a b/lib/coopnet/linux/libcoopnet.a index 6f0a00def5c21758cafcbc6209dc73e0a501dac8..91b64aa2de6564a3e92d5e47d2389f8b3a8aff72 100644 GIT binary patch delta 3970 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 delta 4017 zcmdT{3wKo26~2#zkT4{7=FZHWJ4}*!W$tT0-j}iKrxo z;54xsFbHHLMgb$GODIVIy;#xks1G8oVS$CRLM1Iklo%2;z8a+8nR8jh{)5h1d-nJ3 z{hfXG*>mU4o$lrfVmEAMRE$bdIT{y@j}D6_M2ANcqe;;bQA>1WG&!0QRif6YZLiv% zA&up_M`PSJKH# zw6s7iF=mfb3q^5~Q5#arCGmi9WrCU`OLT!{=Tp@b^)L;*lA#$3rm9n9)wwACACj<2 zjNc~-8^pXONqB~~O;cOw<_W>EwbALS5uI-DDHCgqrMvByUDAL~GXkOC(*8imOZgdi zE8LNsK!1HBIgu7JI`7|EUYeE>QaI|#L~LOe=+S(xFc^KWFgG6B?%2$4trPF?vSTYgyj%EWDK8wU{ERmlJ+L_D5W^5|;Fv(7~ zVs0K2UvDz+TG5dw&~vPO4Atdbt6Y)8R$jo%xW&I>;Xj6zlKm@1`bfxGg1-DuOup(O{^BI>&`ds4)b^&T(jJ zA*;SWgsf+LXbW|YNA-#cp^hP2)J?<+&m>4HCP7?MC*A)4|K=3mH;(?xUOXZ`sXIP# z6|I>b@1^=)djieswP%RkwTpZ0#^PQ_?jYSNjoxF-x#(<^oi(B$#0hx)ELo|MW{wP7_-|6^0OOJpi;GseW3Q%3x)KYEGpLHuTNLu{ zg6d9%!aLv}fOcwF2=i%?X0$I6@i0BP3TamZP-pIUjd z7ft>x=k8&)>&?1{G<$=Mue-y>*DV0wgQiWo!WL_`-WF?CJVea~HXne9%`;BrJzG@X zvkRQXvsK=60gvl*)$5z54cWYu9@&R-i&cJ>ax7zKsYV%gmenfn=|z)o<6N9W1#h9n zdEBj_MU2(PoOI02*LK_a+RG+SaByyO#15o6`1F72;2oF2v*}kj_(`5K<1ah-Nw)F0 z`-FLU;t)bS>^wi1@J|On!UgEr5x&NHb_ChUw@q1SuMZ5#4;zw?qpNRY(yB%!d$6rvqsVUfLXEc-)_9v0 zCSPyzEhgV*^1~XN9-W?%XQ8D1nnmh23nsdF!CV(FILpNg7Q15Op6BA@UXL_8b`v}s z_YN07zG24SckyxmjmOreYWT^?uAPe2aL^o^+){Ds$`11ZE?!Y$pW=*(H(LpfOVh6Aqgqe_p0uc z(^3TL-;B&OfP)My0IAKc#DOC3x3b@Rz6!Tso;xSJYBc&OzY_*XpSJq-Vehm>#O zzw=NSTppDw(6KdGFe8;#GQk6>)B%B9jYRcol-vqX3?Lm!rL#=Yol5oJ!H-NM;FlwnJL{ETmsx?GIRMO~<%@kHENe zim*T_0$ZO!pgNs8SfCMs;#&0a4#2@0WV+L-OMOgm0)k_!Ah_%$@B0X-J`9-!Ci*ChfOMCSB3Fi|QG7W|Pux(WGpQ z<}oz!AV6z5KrKKqfV3@}BJC*JgFt^70(uT@VS#Bm=obO`7XTv5ROV1*7>aJqY4`|& zHpFjQhWMEr3bMc;0$q84sq< zU(_}Il=(w7H};?_2FH*A?*F8B8O=TVWKq0_KKl~I?xWeg__cb7mNQpwZ12@KN7=u@(r*I}I@6Tw zqoFO+Z0-agr_Wd++|91T6N_sTSWy~mZKXbR#o=g3++zyJxyFYZ# z7meD&BW~CzmparentObj->oChainChompHitGate) { + if (o->parentObj && o->parentObj->oChainChompHitGate) { spawn_mist_particles_with_sound(SOUND_GENERAL_WALL_EXPLOSION); set_camera_shake_from_point(SHAKE_POS_SMALL, o->oPosX, o->oPosY, o->oPosZ); spawn_mist_particles_variable(0, 0x7F, 200.0f); diff --git a/src/pc/network/packets/packet_reliable.c b/src/pc/network/packets/packet_reliable.c index 86f48a05..05b52534 100644 --- a/src/pc/network/packets/packet_reliable.c +++ b/src/pc/network/packets/packet_reliable.c @@ -35,6 +35,7 @@ static void remove_node_from_list(struct PacketLinkedList* node) { } void network_forget_all_reliable(void) { + LOG_INFO("Clearing all reliable!"); struct PacketLinkedList* node = head; while (node != NULL) { struct PacketLinkedList* next = node->next; @@ -47,6 +48,7 @@ void network_forget_all_reliable(void) { void network_forget_all_reliable_from(u8 localIndex) { if (localIndex == 0) { return; } + LOG_INFO("Clearing all reliable from %u", localIndex); struct PacketLinkedList* node = head; while (node != NULL) { struct PacketLinkedList* next = node->next;