From bee33ed226b186ef863c0f9716f631a8c2397ec2 Mon Sep 17 00:00:00 2001 From: JustinAJ Date: Tue, 2 Sep 2014 20:48:28 -0400 Subject: [PATCH] Adjusted format specifiers for steamid. --- Release/Plugins/RenX.Core.lib | Bin 52542 -> 52542 bytes RenX.Commands/RenX_Commands.cpp | 4 ++-- RenX.Core/RenX_Server.cpp | 4 ++-- .../ExcessiveHeadshots.cpp | 2 +- RenX.Logging/RenX_Logging.cpp | 2 +- RenX.SetJoin/RenX_SetJoin.cpp | 8 ++++---- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Release/Plugins/RenX.Core.lib b/Release/Plugins/RenX.Core.lib index a8f990952b0bb2c05ab6a637568d1f5f40019415..fb1ded9079c2bf2854570631974c0ab3c7bdda62 100644 GIT binary patch delta 3095 zcmZ8jYfzMB6!wCsX~3|KyHmPqrseABqAB2Yb(BFPguqK?$V||bAyL-Ucw%N?fdtgIp;jjdCocS`}!+~ z`YVTe>=AQkCnQ1utgVTM77hHg{l2JC{(^2RG;WU`vNE^LzddpYyLbz&@XJoNg?5e} zEVilS^Ln8}{e!c^3R~QkQ7dyJGp7xrF9HUSvVhM$Q{e>N4vc_)_j2`50Y6{0kgcF7 z&9wbg#I{h;D%19HC)+mf*8C8RVxR5S{8sN#1g0Z=BocVI%nm1uq9D51YLKwPlD!=G zWKWXVYOJud*fN@!ufV_&gCYh&>wEFgd}oRg#nk^S)~E~3?5{O=q4dbGk(h#(xz|85 zZM}xg*}?f;`%)EN=oJ6^_pLSltuSl9D(wwq7=xvykA4m6-BFNzc&u{L^z7NM=_DE_ z9}t@)?>V3)@AI=HsU>flxjIYO7A#3NNi?>xExB~PX+vVvhhS-@vPqva%S0>^p{s*8|GJW}l&=7e&;vEelw>^z+< z0H^R6RKp%PEyFHbntVpK6cdi5GlLQ?fYoOvK>j=ngbr%Q4ejKTvz8ahZ3en6LW z+;kfR9K&G8*;f^sWDcG+_8*%h<)zk0c|panzeX5Jxn;FdF0KXi*Rmurb)Oq~8J^1~ z_+?mj+^7lgxNZR03NP35AUo>~aI^HLdSlN`Li5fEAp#7ZQ}ebClP6JkALOlsPp*il z+2>i*vh$KfZ7#D($ADyHf zH#Y_I7DhY4b56^Pa`7C_LEyKDX;J;G0ZF(9a1sFr1S;IOzEUCur~<< zM5OWSYRZy{L5b!yv;M1^<vrm8XUgZ-2MPf5zWDto%31cAGBKzcOW$(OJIo4=+ z@IoV$sEa9_frvc6!%~!7RAFSoqky@;iFwx{_fInxhpQS=J!PkObXt#2O&Jb|ua#D5 zm&dAhxhSX=m)aS>w|%3kK%26)mt@K)xm+OsT#^eU?K0Q0S_?evw+*w`V%sg1{@4r3G4m~Fl~u&4a6;9{Lv?E9Gb;hM={za~?Uvk*-iNwbhc z8~M>zXj$_L_^xULLsdP!rtaKCbj-yp!G$xzok%u$o47kQ+5X`7inmM6237j#7I&?p zt3U}Uh0VM!g-P?jy)MnCLKEdy_UEV=5t<8|jg<0`(hqZ|Kuot3MnS8)73Zbsu!S8a zK}C0hnIW!0Im}0gd~|p^d^}VSkAWEh$)Xn(kfO+@4hrv$aK^iCD8^Le3pcsQi8nuF zIO#AAaEF*c81)Uc2n4mGc53X=MQ*YnH8;n#!~n19O*6kS8NL|3|V@QNi&&uzC^ zwG621dld>epiwjfnFzRzW?(Bkm}7^QwNt}jiCdalxDW2A%@?|a5YZ#6OK+Ug9$uB| z9(ga3Wbz=i-Bpi73dNI*8<>i~g(!cOWhp$qE7HrEO1YiAUkQ7xNFEYD_G(Xpf_q$L j@x5Z@M|gPGP;A0|^SJQc=bp6RpFhx(5q)g3_f7l{QO^?8 delta 3095 zcmZ8jYfzMB6!wCsX~4LQyHmPqhUMz$k}2SIb&Me+gg`ViWhQOPkSJ?vys;>GK`zT4 zZ;&irKoH_4sHnKEhKVS-{%h1GZR(FT&i1Dt4bybadC$l9Zr{J}%sJcRn=}^!U~NyTSTy+4@%y4?`3t(O(7Zi**u(4&|MtjX?BXr3!Y@177TP&> zsMw~F&#MIv^$*T2D{OIF#yrf9%$h!gz6cmP#sWU~EQJ$vJ1_zU+{@KJ1^j%;Lbm+E zbkp{*kZqyD6{hWzD{R}mTk}IOiha6U^IN$`5txDSkx1bFGCLeEjDqMQt3kpFOZIZ$ z<2}h@tF^+?BFk7}{ssn)8WJ%C+TTxr)?0B#6jT4RNTV(^bH35wh0+7VMq&zD)?Ne6 zwDlP_XBX#p?MqX5p&I`8@5?s+tuTAPD(!V-7=xu{jC}>_-BFNpXuNXL^z7ZQ=_DGb z91xo%?>(R;@AtDLX~plDxvmtmEm)jll4$N=Tgt&TrVWWvAA$$7lui1aRU%@M2puKt z(_7*)e5^3Flx>Nn%OqE&4gURh9OY^(-DcWcWo*kT+o5c(cAK}6Oy2U(4GYV4%J>gq zCZ~s^mV0(9p8(k4S7rO#Q(|WKRgB}2U5~O(L0SKLAp`ra$x4B#UQU+dEi;l?VKgv( zJNOKnnh_{AlMD4ThlDy2TYPvNPud0qoJNzDzA*!u56h&H$FswXHtdKNCBn2EQNnl& z#zRa;ENQjoXs$uP29J-bC4j<}<$DhSXOnyr)6BIIEG~B~Iyi|@lr1%!k>@xgbsu*tWLGu+=T?i@#BRKg z**Sb3gPjeqb5#FRpJE6(bsTrBM&?lFe8LHtb5DzdsV+h$2}rengcC~r#)j8&u=8Y& z0My_ysD?doQiff&H06|RDJC3EX9gu)04q;Tg1mVa2$gHc4ejKT)0XGSZ6>-cLW z{0tie93x=I>6aCnWDcG-_8*%h<)zh1c|pZ+pjH@4xg~W{F0KU()UhNnXTC7Ww`&3C(K|LIfCWQ1iALlP6Pm@8!M;pI#JE zbI!7;C1)jz+FWLnfdMJV#xs36c$zfDf_NC;>|#b28da$@d(I{v_T;8KRhg*qTa&1v zH#ZgY7DPM2)1c)=xp)reAn@D7v@kCY-mO@(21SNQ}$k=TqFnM9%@F&2VtvQMsd_RejWV~vIf zFEm1lI+w~Bh{&^BEJg7-6-FjJ3Yhy_n0GaD|15KHxT+!5Q+7%~r#0x*lIehiI%$=5 zd93J^i-KBlzLW9$I@hTRv?|_rx-J<`Z9E=y8JnQSZ1bhTJ>`c57wg1gKfuKIS4{=`Wtn=Mg=pGHnuU$D zksoh`wpA~I?~*n!RMnHq>ds9<$4!_exNv5;6UioT6ZaKOwmXp-E@{*5X|gyzCtLrS?w>BqTo5OYlmqo9@76z8Sru!S9_ zK-slKGedlna+r?}dFb$Dk zwG6212Neo9piwjfSqQj|W?(Dan`4Kz>}g@J#4TMd+=sW+<_ldyi0GBor8myOUS5?G zz4Bfn$>c$3yR9CH6pAMqH!ux>3sC-Q%TjoBTcnpWm2x}#z83aakvt@R>eHSC`FFU= jqB}*(kMQuWq1eQ`=5gV>%RTA5JAbezqx#uo@1Oi1wPIGo diff --git a/RenX.Commands/RenX_Commands.cpp b/RenX.Commands/RenX_Commands.cpp index 1d6b618..b14b83b 100644 --- a/RenX.Commands/RenX_Commands.cpp +++ b/RenX.Commands/RenX_Commands.cpp @@ -355,7 +355,7 @@ void PlayerInfoIRCCommand::trigger(IRC_Bot *source, const Jupiter::ReadableStrin else msg += "IP Not Found" IRCBOLD; } if (player->steamid != 0) - msg.aformat(" - Steam ID: " IRCBOLD "%llx" IRCBOLD, player->steamid); + msg.aformat(" - Steam ID: " IRCBOLD "0x%.8llx" IRCBOLD, player->steamid); if (player->adminType.size() != 0) { msg += " - Admin Type: " IRCBOLD; @@ -412,7 +412,7 @@ void SteamIRCCommand::trigger(IRC_Bot *source, const Jupiter::ReadableString &ch Jupiter::String &playerName = RenX::getFormattedPlayerName(player); msg.format(IRCCOLOR "03[Steam] " IRCCOLOR "%.*s (ID: %d) ", playerName.size(), playerName.ptr(), player->id); if (player->steamid != 0) - msg.aformat("is using steam ID " IRCBOLD "%llx" IRCBOLD, player->steamid); + msg.aformat("is using steam ID " IRCBOLD "0x%.8llx" IRCBOLD, player->steamid); else msg += "is not using steam."; source->sendMessage(channel, msg); } diff --git a/RenX.Core/RenX_Server.cpp b/RenX.Core/RenX_Server.cpp index 01e8268..f6ee16c 100644 --- a/RenX.Core/RenX_Server.cpp +++ b/RenX.Core/RenX_Server.cpp @@ -689,7 +689,7 @@ void RenX::Server::processLine(const Jupiter::ReadableString &line) default: case 0: if (player->steamid != 0) - player->uuid.format("%llx", player->steamid); + player->uuid.format("0x%.8llx", player->steamid); break; case 1: player->uuid = player->name; @@ -792,7 +792,7 @@ void RenX::Server::processLine(const Jupiter::ReadableString &line) default: case 0: if (player->steamid != 0) - player->uuid.format("%llx", player->steamid); + player->uuid.format("0x%.8llx", player->steamid); break; case 1: player->uuid = player->name; diff --git a/RenX.ExcessiveHeadshots/ExcessiveHeadshots.cpp b/RenX.ExcessiveHeadshots/ExcessiveHeadshots.cpp index 97eb283..c73ff07 100644 --- a/RenX.ExcessiveHeadshots/ExcessiveHeadshots.cpp +++ b/RenX.ExcessiveHeadshots/ExcessiveHeadshots.cpp @@ -55,7 +55,7 @@ void RenX_ExcessiveHeadshotsPlugin::RenX_OnKill(RenX::Server *server, const RenX { server->kickPlayer(player); server->sendPubChan(IRCCOLOR "13[Aimbot]" IRCCOLOR " %.*s was banned from the server! Kills: %u - Deaths: %u - Headshots: %u", player->name.size(), player->name.ptr(), player->kills, player->deaths, player->headshots); - server->sendAdmChan(IRCCOLOR "13[Aimbot]" IRCCOLOR " %.*s was banned from the server! Kills: %u - Deaths: %u - Headshots: %u - IP: " IRCBOLD "%.*s" IRCBOLD " - Steam ID: " IRCBOLD "%llx" IRCBOLD, player->name.size(), player->name.ptr(), player->kills, player->deaths, player->headshots, player->ip.size(), player->ip.ptr(), player->steamid); + server->sendAdmChan(IRCCOLOR "13[Aimbot]" IRCCOLOR " %.*s was banned from the server! Kills: %u - Deaths: %u - Headshots: %u - IP: " IRCBOLD "%.*s" IRCBOLD " - Steam ID: " IRCBOLD "0x%.8llx" IRCBOLD, player->name.size(), player->name.ptr(), player->kills, player->deaths, player->headshots, player->ip.size(), player->ip.ptr(), player->steamid); } } } diff --git a/RenX.Logging/RenX_Logging.cpp b/RenX.Logging/RenX_Logging.cpp index da9a46e..e2d0e20 100644 --- a/RenX.Logging/RenX_Logging.cpp +++ b/RenX.Logging/RenX_Logging.cpp @@ -63,7 +63,7 @@ void RenX_LoggingPlugin::RenX_OnJoin(RenX::Server *server, const RenX::PlayerInf if (player->steamid == 0) server->sendAdmChan(IRCCOLOR "12[Join]" IRCCOLOR "%.*s " IRCBOLD "%.*s" IRCBOLD " joined the game fighting for the %.*s from " IRCBOLD "%.*s" IRCBOLD ", but is not using Steam.", teamColor.size(), teamColor.ptr(), player->name.size(), player->name.ptr(), teamName.size(), teamName.ptr(), player->ip.size(), player->ip.ptr()); else - server->sendAdmChan(IRCCOLOR "12[Join]" IRCCOLOR "%.*s " IRCBOLD "%.*s" IRCBOLD " joined the game fighting for the %.*s from " IRCBOLD "%.*s" IRCBOLD " using Steam ID " IRCBOLD "%llx" IRCBOLD ".", teamColor.size(), teamColor.ptr(), player->name.size(), player->name.ptr(), teamName.size(), teamName.ptr(), player->ip.size(), player->ip.ptr(), player->steamid); + server->sendAdmChan(IRCCOLOR "12[Join]" IRCCOLOR "%.*s " IRCBOLD "%.*s" IRCBOLD " joined the game fighting for the %.*s from " IRCBOLD "%.*s" IRCBOLD " using Steam ID " IRCBOLD "0x%.8llx" IRCBOLD ".", teamColor.size(), teamColor.ptr(), player->name.size(), player->name.ptr(), teamName.size(), teamName.ptr(), player->ip.size(), player->ip.ptr(), player->steamid); } void RenX_LoggingPlugin::RenX_OnPart(RenX::Server *server, const RenX::PlayerInfo *player) diff --git a/RenX.SetJoin/RenX_SetJoin.cpp b/RenX.SetJoin/RenX_SetJoin.cpp index 731cfe4..9fe9117 100644 --- a/RenX.SetJoin/RenX_SetJoin.cpp +++ b/RenX.SetJoin/RenX_SetJoin.cpp @@ -27,7 +27,7 @@ void RenX_SetJoinPlugin::RenX_OnJoin(RenX::Server *server, const RenX::PlayerInf { if (player->steamid != 0) { - const Jupiter::ReadableString &setjoin = Jupiter::IRC::Client::Config->get(configSection, Jupiter::StringS::Format("%llx", player->steamid)); + const Jupiter::ReadableString &setjoin = Jupiter::IRC::Client::Config->get(configSection, Jupiter::StringS::Format("0x%.8llx", player->steamid)); if (setjoin.isEmpty() == false) server->sendMessage(Jupiter::StringS::Format("[%.*s] %.*s", player->name.size(), player->name.ptr(), setjoin.size(), setjoin.ptr())); } @@ -45,7 +45,7 @@ void ViewJoinGameCommand::trigger(RenX::Server *source, RenX::PlayerInfo *player { if (player->steamid != 0) { - const Jupiter::ReadableString &setjoin = Jupiter::IRC::Client::Config->get(configSection, Jupiter::StringS::Format("%llx", player->steamid)); + const Jupiter::ReadableString &setjoin = Jupiter::IRC::Client::Config->get(configSection, Jupiter::StringS::Format("0x%.8llx", player->steamid)); if (setjoin.isEmpty() == false) source->sendMessage(Jupiter::StringS::Format("[%.*s] %.*s", player->name.size(), player->name.ptr(), setjoin.size(), setjoin.ptr())); else source->sendMessage(player, STRING_LITERAL_AS_REFERENCE("Error: No setjoin found.")); @@ -75,7 +75,7 @@ void DelJoinGameCommand::trigger(RenX::Server *source, RenX::PlayerInfo *player, { if (player->steamid != 0) { - if (Jupiter::IRC::Client::Config->remove(configSection, Jupiter::StringS::Format("%llx", player->steamid))) + if (Jupiter::IRC::Client::Config->remove(configSection, Jupiter::StringS::Format("0x%.8llx", player->steamid))) source->sendMessage(player, Jupiter::StringS::Format("%.*s, your join message has been removed.", player->name.size(), player->name.ptr())); else source->sendMessage(player, STRING_LITERAL_AS_REFERENCE("Error: Setjoin not found.")); } @@ -104,7 +104,7 @@ void SetJoinGameCommand::trigger(RenX::Server *source, RenX::PlayerInfo *player, { if (parameters.isEmpty() == false) { - Jupiter::IRC::Client::Config->set(configSection, Jupiter::StringS::Format("%llx", player->steamid), parameters); + Jupiter::IRC::Client::Config->set(configSection, Jupiter::StringS::Format("0x%.8llx", player->steamid), parameters); Jupiter::IRC::Client::Config->sync(); source->sendMessage(player, Jupiter::StringS::Format("%.*s, your join message is now: %.*s", player->name.size(), player->name.ptr(), parameters.size(), parameters.ptr())); }