From 6a86cedd1aadeaaf6625b9982020c9019ace5406 Mon Sep 17 00:00:00 2001 From: JustinAJ Date: Tue, 31 Mar 2015 04:36:46 -0400 Subject: [PATCH] Added parsing for "map" command response; "map" command is now sent before the initial client list. --- Release/Plugins/RenX.Core.lib | Bin 110530 -> 110530 bytes RenX.Core/RenX_Server.cpp | 5 +++++ 2 files changed, 5 insertions(+) diff --git a/Release/Plugins/RenX.Core.lib b/Release/Plugins/RenX.Core.lib index ae1ae24e07b4635f3ca19a59e5f11377f6a6c559..f95fc83995a6330d532c1f9a7fd878b4e7735f45 100644 GIT binary patch delta 6947 zcmaJ`c~F(t73ZdEXk8uwSyYgR5Y#6iXjD*8P*ftw5|^kTi%3v*aTjHAAsQE+dCFD6 zh*cw+ilptBsZEsFCNs@s6x%d)8YenUr%h)VHEpN0jkP`J+?v>b5k3QP?Qi5tn+TP#Zj`*`Bl^@@+4F*Mz&hFY zg2>XMWM3t!@D(q+wF2dcQNnL9ni}ur<@KD`09RN`upI0sB9s!K43rJQ!Vk?A`iVJu zt-S)|*ZuU`X|Q$xtj%e0$mfTfwG1O~IKwc=?z%+=S)M;5v!7I8Klk@ssK6qSr2(wk zu}i7;28eWnEl`Ov0>xY{x*q~?F9mA2a{=xUfNLv^m%VeuFlh@A0a_CPy8SE*GJco` z;wl^r3^qc~b48Xasz?0N{M8sP^(!d&)df7!sfmXy??VJg|)A!3Q)q*4)j zC`2sOA|RA1Y{+P_Qj09BPmJc(Bp)2AtlC4xB4ZVbl-P;|IKjYH%A4V`H`K62)x+OI z;QP}c>vxUntesI=AdCrP2)%n1+RiYMgjT1;?PxOnwh`cor}J|*Q`gi^m6A!cdy`|}i9$BSaC7MTD(dyxZh zc4_*e0ONS1Z&#?Sk7W9MCW|21Geh`N%JV?UfhqrBVkXwSE=gIF30gzO315UM z4lQ!~IIFyOx3>BUSdB)j(YI5j&v>>!GXvF})f4i3UYd6rOItp@#CheLQ z_huZ%FCmoifdM&smd2TZ^A38Khz?frDMHYQ5!(DLpm<>qdbsC26a z%93cs{o{S+XX9 zaZ{qO=Ma2jqDfS%#vYX<8vZMsyGb05DTos@xgaoT3a$$LEtIEcidb2gDpF*Jukd$g zDoA3x5U^ZO%miSMrc;|+wl+q`A!LE3b4Hf@UWy69K+R8KsJ+V+^TTF~7VVR&tgltY zd2_a?)^f_oiaAPNHAn1mM;j!4QuWkW4;U9?NBG<;d3G{d-d26~b*dxf5`#mpn??D!WWaa{$p>?o$B`iLDW_7>dsiAD?D)@+WampQh zki@Y@?pK0^0W9ZCOnfV#eo#gw{<#Zza-xe{| zRCwkDbZiwD9v$W`wX0s7UM!YtW(s%cnLHWbHOZ7>;V)|Yo$y+!yrY3v5yod$%Sj! z0Vz!^*BfdgD7^tnIU6U+j&!zUjqUWfi5-C= z#|8#(c89JFygSh9q>Z{LQUUyFD2iCWY4SlmXVYZo4;wi<91vApG^{%V>#ED`a{nf- zIIerdaeos>M@_$Yvl?$}Hj7;vvcVU;h4Gnyd$w@Eitmehm~IuD^=k4~d`@u|u#LTu zz8NKNZR1fwp--q&`pI=n9B{8{v5slCa9p*WRY6XwPq%X|8QKr*VA?5}-|kS3eCm0g zkbLVYCBIlNN_8M4$N57owg9;OA+}g-S)z3A=A;;ycN;um5}a*~499Fn-c7t25&Pyi zc(sX-gCM8XH9PruPt=*SlVcZCXP$RH-Ngk#pnst&Hf=Yb5G^Ktzne{vzBy4g?_qte z86SKT!CCnM1V5{^WP_{8-{1Ac6Ce5O^;}_4hJ^WIGe6Q$u5ipz@xRW)1Avg~mDjnr zES0fhFJm)9@X1~tf~4AaP8D7KK2H-4Lb?c${#+xKja&IDM{$}YfBc3u$#}g%nECtp zuul4B^Le_Ti^bH{u>)LJW^4r?`JLzDqk?(H>~%3}Bg#I)BI4qwN7U-xBivBt z4KV+x`>hXOU5%qVN7)giQtgtN0PqWJ;fF(#`&~`+g{@U`30Q!4NKbp}Mog7`%&o6) z7oQyCW2q^PZO6GZOpK3@bBx@Zv~%IJ(eGp!99vwWufdz1`#FlZ7}%z`7}+L@^`J7z z?rP(tnre$}=W3&H%#rOzJBMQcWt?O{9Vbt3zD&)!uS(2bUk&G!5F>!EBS92i<8NTo#)T!KTkg z|Jx=x$2W~fq&U0ZHHW>k<~IoQqkfwBG(b89VC~PO6Dn_>;T}a;d}jKKymwZF{@+ON zoaIO@ZNKFloAjK8t#9)vB*>Ny0#={ Jbw!2Oe*o_$X6gU{ delta 6947 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 K_sX)ep#K00@0~CJ diff --git a/RenX.Core/RenX_Server.cpp b/RenX.Core/RenX_Server.cpp index b89b5c4..b5c9d18 100644 --- a/RenX.Core/RenX_Server.cpp +++ b/RenX.Core/RenX_Server.cpp @@ -1222,6 +1222,10 @@ void RenX::Server::processLine(const Jupiter::ReadableString &line) } buff.shiftLeft(1); } + else if (this->lastCommand.equalsi("map")) + { + this->map = buff.substring(1); + } break; case 'l': if (RenX::Server::rconVersion >= 3) @@ -2105,6 +2109,7 @@ void RenX::Server::processLine(const Jupiter::ReadableString &line) if (this->rconVersion >= 3) { + RenX::Server::send(STRING_LITERAL_AS_REFERENCE("map")); RenX::Server::fetchClientList(); this->firstGame = true;