From 5d43fb36bd62a558e3d39f67925d33c478130c7c Mon Sep 17 00:00:00 2001 From: Lee Salzman Date: Thu, 5 Jan 2012 04:57:50 +0000 Subject: [PATCH] enet lib git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@6746 e016b1c5-ed68-44aa-a2f7-31cac88cffde --- source/enet/protocol.c | 7 ++++++- source/lib/enet.lib | Bin 46296 -> 46372 bytes 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/source/enet/protocol.c b/source/enet/protocol.c index 34658cdd..2e111a89 100755 --- a/source/enet/protocol.c +++ b/source/enet/protocol.c @@ -1548,7 +1548,12 @@ enet_protocol_send_outgoing_commands (ENetHost * host, ENetEvent * event, int ch ! enet_list_empty (& currentPeer -> sentReliableCommands) && ENET_TIME_GREATER_EQUAL (host -> serviceTime, currentPeer -> nextTimeout) && enet_protocol_check_timeouts (host, currentPeer, event) == 1) - return 1; + { + if (event != NULL && event -> type != ENET_EVENT_TYPE_NONE) + return 1; + else + continue; + } if ((enet_list_empty (& currentPeer -> outgoingReliableCommands) || enet_protocol_send_reliable_outgoing_commands (host, currentPeer)) && diff --git a/source/lib/enet.lib b/source/lib/enet.lib index 6db3fca8d8329cad454119b7e0c59ac089d6b593..22d8c5b908c804c8a241da20b09c4938fc01224d 100644 GIT binary patch delta 2779 zcmbuBe^6A{702&eK-UfNtz=yhF#nUMGHE!3BlZuYxuHfH9ha!mS}WN zn{AsP?{^TghXj*OB@eB4+wW7#BrXUKTa~qvoD?HA`d#<(;sYiawMqr@$719d zc>7(5-7$g)}oE`CL;tkB~f0&7k`@?FHF5ML-KVQG;GH=q-b;f$ZGweG4H=I91(~ zre=e-=oEtc?-;^;1|2d;2IX=$L!d>R{s3Cc>9Rp)ESo;SMFu$y@)^_u()*5KDuny# z52`-TYKL$&-B-7jHZNP;Mn{`-2168yND8T-*M9{!J@>&^}kCOqF#43 z{&$Pg78OUk7w1$}8%39iQ4{hQUD>^49(jO}(`W_h!`%n6PNVf{VzfJ>u;UD@)J>8@ zJ+*EQA@WU8zRM)*9WmQ_wL>cF9omaRh}i}eG$3%qGA}T<&U5M(>AgvlaL(tK%Eag- zNxetkZUsWQoy1rh180 z5kh!UNd{wv_7ZE}a9--Y&8_=xu=Yjg^}6zdgox2E(Nr6)zDC>k^U@}lG1t!N-aAp$ zl^Fdkvk0{Z{m0HS&Cijfb|<{8eg3^!yW!!fmn=h%};<40_vTn$r% zS(L|>jjdv2J8QBj`4Amur5F{V=)KMJ>&szAt!&g%_?D^X9=24Y4;HY!8NMZm5g!&U zd@DnYx)~q=zf^7Pd^Gqu@fCDx>oQ4FO>BM0Tz#bKI!EdR)+%<`6q8Dw4|7k>-N%q^M@g&%heK^SyqlRt)dNNf2u@Lts-{rFGu3 zVt4~PPB5ct{J3uFP=DCqobjF)qvcF>D1d_|@*>kU>#GsV6wvYT0;X-sRi7Yo^5Bp4 z#Od1p`OUl4jpi=(X-k)~NvfHuMW$Q$+9>(Pq3GKy`NhcjJDS#o*fq*jm$%t0%3jQ1 zm-moGl*{SQ`itpE|KT~&e`;E49&L%)clo6TUmq(zQLaW;g!KEKKgZh+w3X{we4+c; zuP85s2~=Bo1deDdxzcII zb{iKXJJF`o15T(O0D6bSz7l-9dRzRYK^divpJ<`wsjCQYB#rcV4ZfI!)H^LkSdIT% z+Y~^7%E{nIs(HO)R;}{K2Zy0G%3|u5-V0*nX*SGutJ;_?Tx9!Nc`%?JaHU?EVa3O{ zPG1Q)^~H>qp~ZS=7mo#j?g>ykmO|X+9h!dy9rF`H#+dHFgY+T*MIaVjG;Qb=F-dxO(RZ*aW z-ED<*GVT=qNG*fk$bO5}$zD|V7r|Y0U#!s10{`kZ3;eZ%R0GzXjtn|1-%A(c8Tz+p z?DuNHQa!pOmGc$7KA7LS5|(Xk0fh2|lOBDVSXOMCV`4@RPhx0n$Eh0~snMH=3@PJZ zgK^A-$Fv=fe0%568D^9E3_|55U3Rocs7N#(4GY3aIzod&F7-Y4q%fZN#dDXlLbb~Y zDT1|)tda=9e=%eZc?YzT%iae$IL$341QP5aTcWaXhZ;Z%Gk&oply1_r-0>LI1JKdtqU0xP*r}CS(Wmit(?U(l$cPXw;d&2)}y>b0= K!SNH-)_(zlyh7Um delta 2888 zcmbtWZERE589vt`#Lco^11=&tF7HA0!{+%bz;dRvOPVL2P>Tp9-*WBfOA#-_I_+Mpbr$M)4Nuk5i9Lfe&c?VKEa z3Am$!{#bEr^Jk4=c}Qg^>mHK|(u-GpUCRGr#xRns&OIc#*bR40>CG<6S-TG1 zuupMF2$UIP-uev{hao~rwU;}y9y2;-B*ilVyCv+E`o;Gw1+tUsd_v|4bR4LRU8<+j zQug@j6(Rdwgp>-62WWvnyMgQi{Q&45fnquIVh+8YL!SUG6m};-qk9Fa{#q8*=TJ)y zwV5b{K)Z9or*ddNP_b~623jQ08K4q@{*ptJKxTpkSU(e$1?APdS~b*%!4DBex1H>0vUwgL|=u%c}f>wo;7GsTf4n_Yd76#lP>E! zZCl1*LU!)(W1@Gf7?_1&SE|!;G>%=b&dAXL9->{D>!AB;^lA3n!%C>kK#vekdtZO3 zU5-A&hrIqjqyF3Ki7$X6JSB>WE#yY+JVhlkX_4bSSf$9MBuAgdMvqM9$??ZIK$zfs?N;wM3`bRv0v8pSEp$!I0FmUmz^TiUy z_^%wj#7`IAq&LoD93JAoSQVf8cRAX@KA>$YYX|l5!yC#YqcSbhdZC7&GS#Q7l_PyP zClZ}j2<&>h@}PQJj{K0d^_6x$%8#69{Wx)=zv44Cm@AN&Bf;i5FW0sd)29e0RE!&l z9t0zU1(DIEdULR`dGCSm(}%19day8nlGco`PaGiZWM667)J?+(AmSQ*JfLo{%32+I z7*L-rlr;yt)>kVO@GHZ}xL}U{%`Rn7*^Y%AKTr26iuRctoxyUl@1>T7 zW?O2@b~W)fvf`C`8)LkgvQ`X7NYmH&0&kJ5SuxhH-QG*>`m|x-bbj}{Sf6dTPSYz8 zoBq@ba&$4@O3g)dlT8}YTm1;(pgmPJnLTJqcuEjBHetrf(jxYI=rUD#ge^-}h78_4 z-Y>qdpF76WeA4S2<7|oj13FY|vKU5d;odX$w~zRiwPoJpA*Lsgo&2-G@w8a>mhF5E zrXiyb)aWhS`KgfbDeZd94=x5GKk*Uy&~=bxIJOxA3qRwrrBhv2oG0gk>p^e5o8$L` ztJt@XIE#W-bx4kHg2P&a9Xn#|DjVN=YXLwTWI|sYMB3^^P`#yT@k0Tc{*_uc>Q-vg z&g~z8Hb?sLlY#KVKH}AfGjCvFL9IiS^(U)54U^~xKg%Aj(f{N;9iBE1nZt+>o|dac zu~FQn|KyG5TfpDNuhI)_I_Z@D#gx?g&>pCqBkN|3Gd+A)qPxQnl%oui>7APGIG=rT z6r$l?zQ+6+_A0oth-L@|$r?eAJ3F@^kUKKyHnWE>UbV0o4v)f|PtH<}wz5}KRhIED z+09hhf-=O8j2M|-P$2PE73>Jx^L&NWmOk=)M3O#W^ZSF6hsFD!mNMxZ{U7ItYL^pI z0W&-K3TQsiT=G+eko$$~D3C*-Pk_)3*e$BeYPSO2CuF@qrrp~>roX!p-YK-N0l5UC zaA981^)Sc1!!O<)fac_9@G%3YfXr|o!iO1T2FRSe1An*=sr3AAoQxV#*8s<3 zFMhPX|1<{{ZJt BU0DDC