From e48f6d6af2a4b7978ffe551bc291a84940a38b2b Mon Sep 17 00:00:00 2001 From: JustinAJ Date: Tue, 2 Sep 2014 21:28:53 -0400 Subject: [PATCH] Changed asUnsignedInt calls to asUnsignedLongLong. Changed steamid output format to capitalized hex to better match previous output. --- Release/Bot.lib | Bin 19582 -> 19582 bytes Release/Plugins/RenX.Core.lib | Bin 52542 -> 52542 bytes RenX.Commands/RenX_Commands.cpp | 4 ++-- RenX.Core/RenX_Server.cpp | 8 ++++---- .../ExcessiveHeadshots.cpp | 2 +- RenX.Logging/RenX_Logging.cpp | 2 +- RenX.Medals/RenX_Medals.cpp | 4 ++-- RenX.SetJoin/RenX_SetJoin.cpp | 8 ++++---- 8 files changed, 14 insertions(+), 14 deletions(-) diff --git a/Release/Bot.lib b/Release/Bot.lib index 1ff74ab6f4691161851bd57b1cd7aab8d941941f..8b2812c61176e2e7c1d9d36565fcbd24ee81caa7 100644 GIT binary patch delta 1437 zcmZuxOK1~O6rIF2rdC5CzbduA&{k5L=F|Lt)1*zNW2i-Ffky2_Y3L;%p=|V!q z(7P$>!j;=vstctXcbZjkDI(}frA1ITg;IU@Chz4H+$CquIrq$Y@6P_JVSm+7=`e-8 z;b6oE6?^-7Y|38$yHT;<=fBw_2Y3eCjLF#zb#U9zP&hyvYHLo;nu@RBk*5n5hQ7)V z?|MkH?CFp+PFM?CnH78-&T;Zw%-w=6y^5k3;LGp{IPdG?4=Z*i@mh)CVgw_keGb?^ zY=-aNlbo~_aHD6$m*5D>>|vVp+?V30nsb7|PpHFxiKEDU=(o0FhJH4}q%^^Lixd8K zo1yBLDssZ10EycJDi^cxIJ(?G>S6W*QWysmM{LNO9*J=!j%9vFacmD8+p07vaIfb$ z?2d>RE5*rO3+l3pRYIKfj zL_btiuZ%vB!Mf#}QQ4AKvW(YiDzXu7yq;SF1^Aga!*N7Wn^GLtKE z1ZRKB5${)SK}O4YLZ9VlWb~9qXi5{?EnU&7CN2*8`X`91P5ie#Kb)O#fkhYXNk%1I v7$N#zrxW|EPx2`B4ZLzjY#=*p`oQ49gxCjW(b~6C5T)bBL<{6HS@8Y?qp614 delta 1437 zcmZuxOK1~O6rIF2rdC5Bzbds~+DdBEWb*$snKo@Q9YZY=MMNZ^h?Ib(D2QZHr3(oa zL+_@j3s-JysVwW6iW5oo4nUoaF?7p=iD>ry*qo$roClTt=$rd z$3kihYOc1`#I&pNcdh2S&wsN=ZtxA-%@t!!8{9JOE8L(D*_$hdrT7XS`8uI8^i_U% z*GHN~U%RC7z)IM`tl;Btj+18--WGJ}Q53}lUxrV>`9LRsSaUIn-$8_4MleGr;D)`! zR`~8e$w`|*FM7rTDUP7b6{Shf18I(GIS-grLfz^mjw1J=>S)Cb{cMCqX@b=j5B%-2 z!iFkU@9YfWMwG+0(LS>JTDis;ys#4MePa>54MMUSQRFXF;O2YGA zh*H|eQIQrMZpO&L5-V^A30>Gn(RaJfHOCM5UXGLRT>LtBz-fQ#=#fN;qm5RdCPdFT zX(vJRZAoc9z3F07^n<+LN#a>k)7%da{&tGcYU-Sf?$lA+$VHA~qV+M#xjb@1M%&X) z>OIeT?@*c*(99WFk6Yojc3@jxrb)e#z9y@U456jW3`aLJlzulO(qqo68s)sBUEn-S z^g~1S(&z&jY*@Y-l`UyiPP2%8@OHEp=Eu5Z341dl7>v+QglS6;bY#UfZ(O-@R)oUw zAF>qwTXt49yERT|b^Jh0wuyR8MK;2V*K>2A06+6q*cx%lYR1ErcsDV}Q7uP>lygOn z;OtL1;{D21WVD(m^jW?vqo;I2)4JGh>56XX;^LsMI!Ro8^1tn=aCWj6Y=&r0GAbFu u2+{Wjo!Dn%ibrW|;FU9C1KC;A2L=x&!agwbj=rUWC>=K@ULcpLg8v_j{f{^R diff --git a/Release/Plugins/RenX.Core.lib b/Release/Plugins/RenX.Core.lib index e21e5eea875019013391156b155971745a972e7a..7905ece2bc56b04ecc0eca30ba9a4352edb35327 100644 GIT binary patch delta 2938 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 diff --git a/RenX.Commands/RenX_Commands.cpp b/RenX.Commands/RenX_Commands.cpp index 385d3f7..d1e3c80 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 "0x%.16llx" IRCBOLD, player->steamid); + msg.aformat(" - Steam ID: " IRCBOLD "0x%.16llX" 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 "0x%.16llx" IRCBOLD, player->steamid); + msg.aformat("is using steam ID " IRCBOLD "0x%.16llX" 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 61d31c6..50e3918 100644 --- a/RenX.Core/RenX_Server.cpp +++ b/RenX.Core/RenX_Server.cpp @@ -682,14 +682,14 @@ void RenX::Server::processLine(const Jupiter::ReadableString &line) { player->ip = buff.getWord(3, RenX::DelimS); if (buff.getWord(4, RenX::DelimS).equals("steamid")) - player->steamid = buff.getWord(5, RenX::DelimS).asUnsignedInt(); + player->steamid = buff.getWord(5, RenX::DelimS).asUnsignedLongLong(); switch (RenX::Server::uuidMode) { default: case 0: if (player->steamid != 0) - player->uuid.format("0x%.16llx", player->steamid); + player->uuid.format("0x%.16llX", player->steamid); break; case 1: player->uuid = player->name; @@ -785,14 +785,14 @@ void RenX::Server::processLine(const Jupiter::ReadableString &line) if (player->ip.size() == 0) { player->ip = ip; - player->steamid = steamid.asUnsignedInt(); + player->steamid = steamid.asUnsignedLongLong(); switch (RenX::Server::uuidMode) { default: case 0: if (player->steamid != 0) - player->uuid.format("0x%.16llx", player->steamid); + player->uuid.format("0x%.16llX", player->steamid); break; case 1: player->uuid = player->name; diff --git a/RenX.ExcessiveHeadshots/ExcessiveHeadshots.cpp b/RenX.ExcessiveHeadshots/ExcessiveHeadshots.cpp index 7c41c5e..a37ed1c 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 "0x%.16llx" 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%.16llX" 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 b538a62..6708d39 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 "0x%.16llx" 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%.16llX" 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.Medals/RenX_Medals.cpp b/RenX.Medals/RenX_Medals.cpp index eee17ff..0e8b170 100644 --- a/RenX.Medals/RenX_Medals.cpp +++ b/RenX.Medals/RenX_Medals.cpp @@ -38,8 +38,8 @@ struct MedalPlayerData MedalPlayerData::uuid = id; if (medalsFile.getSectionIndex(MedalPlayerData::uuid) != Jupiter::INVALID_INDEX) { - MedalPlayerData::recs = medalsFile.get(MedalPlayerData::uuid, STRING_LITERAL_AS_REFERENCE("Recs")).asUnsignedInt(10); - MedalPlayerData::noobs = medalsFile.get(MedalPlayerData::uuid, STRING_LITERAL_AS_REFERENCE("Noobs")).asUnsignedInt(10); + MedalPlayerData::recs = medalsFile.get(MedalPlayerData::uuid, STRING_LITERAL_AS_REFERENCE("Recs")).asUnsignedLongLong(10); + MedalPlayerData::noobs = medalsFile.get(MedalPlayerData::uuid, STRING_LITERAL_AS_REFERENCE("Noobs")).asUnsignedLongLong(10); MedalPlayerData::lastName = medalsFile.get(MedalPlayerData::uuid, STRING_LITERAL_AS_REFERENCE("Name")); MedalPlayerData::lastSeen = medalsFile.getInt(MedalPlayerData::uuid, STRING_LITERAL_AS_REFERENCE("Seen")); } diff --git a/RenX.SetJoin/RenX_SetJoin.cpp b/RenX.SetJoin/RenX_SetJoin.cpp index eb6a97b..a0f2d5e 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("0x%.16llx", player->steamid)); + const Jupiter::ReadableString &setjoin = Jupiter::IRC::Client::Config->get(configSection, Jupiter::StringS::Format("0x%.16llX", 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("0x%.16llx", player->steamid)); + const Jupiter::ReadableString &setjoin = Jupiter::IRC::Client::Config->get(configSection, Jupiter::StringS::Format("0x%.16llX", 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("0x%.16llx", player->steamid))) + if (Jupiter::IRC::Client::Config->remove(configSection, Jupiter::StringS::Format("0x%.16llX", 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("0x%.16llx", player->steamid), parameters); + Jupiter::IRC::Client::Config->set(configSection, Jupiter::StringS::Format("0x%.16llX", 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())); }