From ab4462e97a0930eaab39ad5b0dfbf04dc9d7d57b Mon Sep 17 00:00:00 2001 From: JustinAJ Date: Thu, 23 Oct 2014 05:33:34 -0400 Subject: [PATCH] Added formatNamePrefix field to RenX::PlayerInfo. --- Release/Plugins/RenX.Core.lib | Bin 61562 -> 61562 bytes RenX.Core/RenX_Functions.cpp | 3 +-- RenX.Core/RenX_PlayerInfo.h | 1 + RenX.Core/RenX_Server.cpp | 3 ++- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Release/Plugins/RenX.Core.lib b/Release/Plugins/RenX.Core.lib index e6e36c4f6ab9292f724443c28ebcd9617743c19b..d2a60138f52a94380435510aee68c5994aec5554 100644 GIT binary patch delta 3930 zcmaJ^X;hVE5Wb2Ot`G?Kx&o1!sCm`n#yJTlD!G8TRe*_hOj9duQ9Ej2i} zuYcb@{UI^Wx_j^|5w8FC#zyp%e+#RvHhZ4{<1fC&m?mx(&xH{aJ)2l89#E6g0m4!{ z?0uemripS7Snmf{QoP&=bQl6t{lNpCXy00;dNuW2xVLj^ckyuKS|RkQ4_aZ-ns*fx z)54uKKFujiki}wY0tst;p-oyh^_`qn-tcKj-|hIlsihfYw+n*wHEkd(%~wNROfyiy zh;n08duYD4tA+@z;^gsbqjaOe$hlS+amETp#;hBykVJF)MuTP-Oz zpTY#J52o72te>GdVQtKvYHN)t?F_L?U;a-~YUL$GSTHG!0+`SvrXTF@4l{=pqt)+Zn@Q=(Isf=3mvMh1i=@ho$q^?~_iPSVbT=ndA;~y+GaDl}4^>8cfeps( z^k&I7e`Chv8fNFZYGA|DT$v$z0UKs*S*%>@_SjOkdUH>rk!2wDGnMzZ&DZ!n+{VWGZOfD~F^{tsqZ1l@t zX&S9?G@nJdlAmrGZLn&)H*=ef+`1#Tn(u_ee%z!~ETq+Zf3`4I>A*pXnOP|PAW z9^9cLQDF`qgTZ@Y@X(;KP`uL&Udh4R?3$zTN!!J7@^|Sqs!n}eD4oJJ2rmk`9IxH0 zH5#S6jb=>2jD5Ko?W3?BeNyd4+QdDQwr&se=(zVw6-XHzrh%uW$fzY2BM-n@swPJ^ z4D6aIuYJOlT(|Dynu_;{U_^h?ex^TrzqH60C7Q@L56Bo0aNhw2mLK>{t5bD-#X;$M z{4p+K&>=YsxGE^tkwcS|TfllN^eQ%1+1pq|C>F8o6+0|0mQk&AuuEm}ROO-_*Z9M7 zT(!mY_^>P{6`YSN1s?{rhy5Yx$UqgzksI8a7FSRF7LI)hg>1VG>~?qPSR(U4*BH~(?mc*X&89Lx%Q!(mnbhbSuDmiCF5=t&Gy_MSmNM;? zR!A>rjQCS^sG17iZ#?sX-D7_`^(u|{SH)6bI8fl`U9&*g- zcRp9WRI+>0z9iYdrG5Fuj7B!5YmOoDuFM`~Z+*|$^TW_R5$n#FF+kh%I6b^2`{LJS z5b6v9=e=$!Ie7;;nb9EUG-V`_)MhSsHV}y;^~Oj)z(uD&WO=$nLY0gZm7ka@+rI4ITi3%bmo*$F)R zdVtqMnFpmeqoNSCf>G}@2&|p+5r4Q&uq${Hy4B6>@;`xBGNKby^y$(_aMki=kEG?a z-PE%x_fdkWx~omeaObgq~m7-Rqd delta 3930 zcmaJ^X;hVE5Wc7st`I2qx&o1!sCl&`i034j8@YhEm4b+n9P@CKl!c#i# zdzN&@O}YDT@P#YMUhV`chJX}5@PNnKw^k`$O2c?UV+)E7i()9NmN!!-qZh>d+-Jv1l#k8#4`HW~S<#U67WabEE)S{PVN_35J zWR@^iNFJ&XthPN&&-R77tbtl2RpyjzaUylkW^+Y%vcnXTjG8 zyJpI3zc3}&ZTq>VqWvNm(VuvL>CZVJEiy)lCi2aLG6n?Pe~^LY2Y=J*R9#Sk3~j3W{~)@I>Y2zrhNAy8NB2Z={QR3t}EP-|LTz3|&m>`NGA*==CAyF;fEnFq=iQ^Lj0 zFPUsQnrpD3M6!{nN`b|tq5$d#-bcNe!dOfb0r92b;1%Nzh5334wcW~&NY8DAQnt-6t4z@`MzmgyzFS+b$Y= zlhrN=R-Area$RMYpA@3uwVYt_sYNOQ#cEl`3H-~XM%QrVmdS7t-~Oi=IP$cVX|J?G zS~(kUoc>gWRAMYXBPi8w8ZeKuQx!@nlzLVaio4I$I+V{+2o;>mjKnfyvCO!T!7%N( z{u0oFk3A>BsY&JM_#E9i=URw1SbCm~N#}o5NfL5-tMN{ztrkaXV9j^2+FGMgF;;GJ zg{Z+-WQ7mA^+dNBZn5wV2NJ)|}#i)|hs3l&KQOnF=W$l-vO@s~7FB=_ zw(E@uka=AMpqMRbcgtA87V47ExRk#vg{OV zZp=7zT!93iwP*+P@5$mIS?=C5N*IBNpBORlrTbRRYvO&GSFDSJQeD5G%Ys>*!Ly$S zcs-DLPYDHFD&s&-h!1muC-*wT_l&*6NP%Z;gxsrBfG6#S^($)a5m= zc9E(XAK2WSSPZfe303<cMhmlnIPq`My)9;lVJ};=auj)oA1O2qUQP-A?^>v|| MacDgor_}rZ2Um|^pa1{> diff --git a/RenX.Core/RenX_Functions.cpp b/RenX.Core/RenX_Functions.cpp index 0a8e973..647815b 100644 --- a/RenX.Core/RenX_Functions.cpp +++ b/RenX.Core/RenX_Functions.cpp @@ -545,8 +545,7 @@ void RenX::initTranslations(Jupiter::INIFile &translationsFile) Jupiter::String RenX::getFormattedPlayerName(const RenX::PlayerInfo *player) { - Jupiter::String r; - if (player->isBot) r += IRCCOLOR "05[B]"; + Jupiter::String r = player->formatNamePrefix; r += IRCCOLOR; r += RenX::getTeamColor(player->team); r += player->name; diff --git a/RenX.Core/RenX_PlayerInfo.h b/RenX.Core/RenX_PlayerInfo.h index bc8dbc2..68301e2 100644 --- a/RenX.Core/RenX_PlayerInfo.h +++ b/RenX.Core/RenX_PlayerInfo.h @@ -61,6 +61,7 @@ namespace RenX unsigned int loses = 0; unsigned int beaconPlacements = 0; + mutable Jupiter::StringS formatNamePrefix; mutable int access = 0; mutable Jupiter::INIFile varData; // This will be replaced later with a more dedicated type. }; diff --git a/RenX.Core/RenX_Server.cpp b/RenX.Core/RenX_Server.cpp index 204a34e..79ed003 100644 --- a/RenX.Core/RenX_Server.cpp +++ b/RenX.Core/RenX_Server.cpp @@ -649,7 +649,8 @@ void RenX::Server::processLine(const Jupiter::ReadableString &line) r = new RenX::PlayerInfo(); r->id = id; r->name = name; - r->isBot = isBot; + if (r->isBot = isBot) + r->formatNamePrefix = IRCCOLOR "05[B]"; r->joinTime = time(nullptr); r->steamid = steamid; r->ip = ip;