From bc5ade4ccb55a2b12eab6e43c45d02c11d1561b6 Mon Sep 17 00:00:00 2001 From: JustinAJ Date: Sun, 1 Feb 2015 22:19:11 -0500 Subject: [PATCH] Changed ping format due to ping being interpreted as newline --- Release/Plugins/RenX.Core.lib | Bin 78228 -> 78228 bytes RenX.Core/RenX_Server.cpp | 32 +++++++++++--------------------- 2 files changed, 11 insertions(+), 21 deletions(-) diff --git a/Release/Plugins/RenX.Core.lib b/Release/Plugins/RenX.Core.lib index b6dcc11a8bc8daba646743e6d397339e0047439b..f1ac644870e1d200514bc953cc0d0afbe9a7252c 100644 GIT binary patch delta 4642 zcmaJ_e^AuN6=w;c2*}9+cOc3kKa>-W!-7rG3N~qmVW?6k<2Ve1XVN&vamZ=yRNE9t zCSfueC4|+ibvljhABmIF8Cs{)I-;JD0BVESHj0RNRAVVtIEXQt5Yo5%-hRK|(`ot3 z@7uTUectDN_U)brZblur8P&EpYURq3@9;of+8v8Z4-FCpk8%|f@j!>Ulevh4g8o#{( z^<5X(WaNy~Iin+@_$$x5c*2>b#-afzMy6}ZS`r3EZIxi=z}AW97x8Po^SQq_Rc#kG zJ5$N(KdjO541gma5P9z3FTSn@KP+a zs(b5Wv4h>=#n*mB#RGkkjQ)?p*DHHy9U36lyLt#O`LFIZu}Xqf)%gI+4prB@kO5Wa zhT)b$ynW9+W_!=HsYDs)jIKC%!Ue@a+qsRnula#nCGtQbCnO5RW$}vhIk+epXgaSp z95`Q(Hg7-$NtC3O!lrcSSb2E~-+3m5ztoxto9FY*eGbz(cR&R=df{2LQTYXbHQJ?6 zcIa=?PQk~d9V^02Ksd5Bi*Nqe6aXhgl8zPqSe9rbQT(NUgU;#@Cz4SBWfv4_gzVG+A(M&0M~SxtLgYn6NANRi?EJ+xJKsJ)BubV2 z>5}5${G|$v9vV?Km;LQ$>RZ88ZCC+e@}bDtt-1W(AVrWTuIavtu=Vd+yCcr_>q#ng z9qd^y&&}J**YUtGZE{Vj6s`Z*g(>OV`-$=G6u~77Lu`N$9vQ;b{xo-8*2qVk+;=%i z61)5Is~Wk3FSw$x14|4j?1m|F^X`mHt$C4u&!ZRi%^@PDds{pwTdm=#ymZNlZ6 zbP87@_V)Je-5AYkeDhyq41t1(FV9#wUqfRSX#RgEse|}qsHlpsA9wI8OMmz%V@_T& zt}3V;KcvZU@)@+*?of+lRULPfU*HaDjI`hQAJV?`iNC9STz82LfNBUfc=vI^woZfx ztDdA_MA^h7?eT|@!jMmaY@bq}1yi+%xpM|*&bOe{jePBN3NJrm7yGjq$=x!|%BE>Z zLl^i5(@GqH>FpTDGMj5Zt4Et_M&%m&3{%5oRNs5FvHDFBDfYGizGG4HxhBg2B;_65!2P&&i+#A?{GMb5}eF&^Ik z1#SU;RJ<}+d`>Rz{B3~NV8ZI!-!`Yx+8`q zD`i$f=$``}3tnDjiLA3je?;vZMqRape=tXfm#yA47t3y$%gl>SWaG6Uo{VKJS{BA- zAtquO-4?R%^6r$$j?UAJKtuH#Q&hzRX8m**tL+**z1u{WU4w!aihO*y zi8aaWIfN>?rstd(NM`h&!_g}$Q?$Hb92r_3OnHPdUn*tgGTMbylzcE%X9i|fd*lzL zLr@)iHCwbgw3Mx@zl7DqP1aSYUG0@q{xGbb+?XfgQ>|xLPRh6YB}pym)of6^Cm9=~3m8 zCHyY-q{@!hsu*-xsZ(!=B5?me+;Fi>9-ML;atWKYzk_h6(p(~LiN1CrBTa4LTS6d> zf{au8d)W8Z>nYs#y4QSbNy?hDk+OHP*)~k64~T5ACx@)zWp_ff(We&i&Zp*zdpTNI z)(%wW>JCV&9wTG9G!0ZZRkZxwa7-jDg`)p=w3wyVXu8Yq8CDpK^x_rIETb-mr}(pI z%KyJ9_T=jn)}!Zi>!T+nqDRaTw;nOFIC&u}o__$PoB(EazEKhW0@M^JuWIn>lKfSb zo1K84TH?h5lv-nfo(fj$eZwlRU;J+j(NM^$%%;gZOg3$-P~RdFw7w@>Jo=slw(uu| u@DwrQZR-?0ML0o+iu9E%Q{nG7(dxC{3-`R3YF;rbGXc~Wqjh&NbNv@-PPJ_S delta 4642 zcmaJ_ZBUfg73LB^k*}2nc0rUyK9m)fg+h}-E7*Jt!%(G8#&H-1*Q9Zb zVYp=w_rNoc*xn1-RHDptMptY+;ez6z0P*LvTn61gCe9TElOvU%0{TwIh4w47HP z4xVpBo7<;?BuUcBVN(Wltg^CdvpUusW+&53-=fGy;lH>3g_yYMX9sQkje8tqaj zyYx3{r|=Wfju~MVAoOp`=371q34jwKNk{1*mL)n!6n`1qsI%I{i4+t-#l>n3 XK zIMk8D*A1odix*exB^xK?6+?uakewPLWHK@MDDjp-i2R7?2!3X*mA}|wPwC)Q`QXQAj#vr7725HcY$=ZN6)*AzOoA`FZ_@AD*)7*h}sS*!dr?C#!b; z1R$&dyq<#X&>7Rg@C4MR{eeyl>}yC9Q}HZCB3M7ZQ)jdBPsbHqljBE1ws-%D1@46C zReWZ=2)MBDg!0@__eo&h8zxXOHx=-Vn;jTR0_{WF=uN`m{Y>Hd^=H&EGp?Fjgv&8) z7mg(C?X6pTFq+x;=D)}o1O*Xau8DBIMkh?ry#G#C2l2;HQ4QZPY2#N`{P1DM?7VDJ zRZu;7Sd(Grb7-^NrWVPnx^62!-)+(uX}|eDq;|(H(L5~92Iio%cXX+7i_Z-fg??9=W_`2CtUU}3i4rDWuyJ?zL%+ipC zF7OX#l{kE}J1~xEHrIdNh&IQZ$~EyhriRI=zW3fW4J^C>I==|bf2p~)FV-6&lyWNp zULz>CWkV^iyhqq*5UHtC2o77+$oT#;-gA#eh6%mpOPa;O42JKCHLzu?oRODeTzv3L z+yeZlconetoLt=X+d>go!YCk2e~GW_KH)RB$@zdN2kr6R2PmOBi1Pw3c~Hf(zAC_) zG!0)74N}yuRqC*He%*vV=D6>Ct>Yq}wR6NL^iF~qo1+WCta;Bjq2K7jjhg=v zMmJ6H!}B!3rS02!oNGk@x(V1W+2`Qj`_@nbUd{4$dI=Wm_BlmcF*8jO7-ff|)g(KV z!Cs>Vh7RYUK^8iPTHIncW4b(WjgM64SU4itUd@(G9FJ5{#Xuw@&hQ9{y2qH7y^^_@ zeT)$~lGUA2EJby5Jz)N+RL5KISBdU;-Axpza761(Ar*`6Xht$dn#I}}Mm)>VT`??0 zDYF_v{~YL8{PJp3WSt%QBkC70>Z&RH{RKL_Z1wJiSa#b&7P{C(4qgl5iCEUAWno+v zVk(x=Z6W(E?@pQQ*domcG*rJaMNJ%|HcMdLaY}5WFOHc;sEnX0lDF?`P|?=rryr__ zt^^U4pf{qH#nA-a7<^8Nm5B`BQ$ij$1uT)#F9?%NMOhMQLO+qja1z@XlFoi7mQ`=j z+A;5*H>{7e?%LG@4CqtVq^v#Ir0;B{MwC`sps#ST%Thw}~FB1_dn?1^93i zYg5>B2vu@T&p9!a!stDRqgPa?YI(spGPFFL`VeKFG|I|lvMQi zO_qN(9iau&wS>)TZ_XgK8=cQwLY+4($HFY?gvw$38}(rAcA4g_j2z5Ix%x7hS04j? z(F)H})`~`Ir)3$nlber4`!anjWCcsIumX1$!-*LF;(Z?&D%oIq@#>~44%Y$FW6C32 zcpdBsl^w5DG3+o?r`{07;QoQQ?qFFwFyl1j5;kjp2jNboJ4D=aeeFU z!T(LMw?L;bA3eKMA3Z4%Jz|bJ^@x$h$qQNW`~xWE1TeGfjjHe$pr$~1)q+=#03mC*7szaOW%{g7XD-q uu3~1qZSA737$@jxvA&XJD*XK>+TG@R;jSA~Eh=FZApngfXx&r79RCHI_A!$H diff --git a/RenX.Core/RenX_Server.cpp b/RenX.Core/RenX_Server.cpp index 0c2f7da..3748a14 100644 --- a/RenX.Core/RenX_Server.cpp +++ b/RenX.Core/RenX_Server.cpp @@ -1105,38 +1105,28 @@ void RenX::Server::processLine(const Jupiter::ReadableString &line) header.shiftRight(1); switch (header[0]) { - case 1: // Client list: Normal Player Data | IP | Steam ID | Start Time | Ping Kills | Deaths | Score | Credits | Class + case 1: // Client list: Normal Player Data | IP | Steam ID | Start Time | Ping | Kills | Deaths | Score | Credits | Class header.shiftRight(1); { PARSE_PLAYER_DATA_P(header); PlayerInfo *player = getPlayerOrAdd(this, name, id, team, isBot, playerData.asUnsignedLongLong(0), action); - Jupiter::ReferenceString pingKillsToken = buff.getToken(4, RenX::DelimC); - if (pingKillsToken.isEmpty() == false) - { - player->ping = static_cast(pingKillsToken.get(0)) * 4; - pingKillsToken.shiftRight(1); - player->kills = pingKillsToken.asUnsignedInt(); - } - player->deaths = buff.getToken(5, RenX::DelimC).asUnsignedInt(); - player->score = static_cast(buff.getToken(6, RenX::DelimC).asDouble()); - player->credits = static_cast(buff.getToken(7, RenX::DelimC).asDouble()); - player->character = RenX::getCharacter(buff.getToken(8, RenX::DelimC)); + player->ping = buff.getToken(4, RenX::DelimC).asUnsignedInt() * 4; + player->kills = buff.getToken(5, RenX::DelimC).asUnsignedInt(); + player->deaths = buff.getToken(6, RenX::DelimC).asUnsignedInt(); + player->score = static_cast(buff.getToken(7, RenX::DelimC).asDouble()); + player->credits = static_cast(buff.getToken(8, RenX::DelimC).asDouble()); + player->character = RenX::getCharacter(buff.getToken(9, RenX::DelimC)); } header.shiftLeft(1); break; - case 2: // Ping, Score, Credits list: Normal Player Data | Ping Score | Credits + case 2: // Ping, Score, Credits list: Normal Player Data | Ping | Score | Credits header.shiftRight(1); { PARSE_PLAYER_DATA_P(header); PlayerInfo *player = getPlayerOrAdd(this, name, id, team, isBot, 0U, Jupiter::ReferenceString::empty); - if (playerData.isEmpty() == false) - { - player->ping = static_cast(playerData.get(0)) * 4; - playerData.shiftRight(1); - player->score = static_cast(playerData.asDouble()); - playerData.shiftLeft(1); - } - player->credits = static_cast(action.asDouble()); + player->ping = playerData.asUnsignedInt(); + player->score = static_cast(action.asDouble()); + player->credits = static_cast(buff.getToken(4, RenX::DelimC).asDouble()); } header.shiftLeft(1); break;