From e0d156f97f56b8abbe693dde7de6885bae8db9e2 Mon Sep 17 00:00:00 2001 From: JAJames Date: Sun, 31 Jan 2016 00:11:53 -0500 Subject: [PATCH] Changed several "players.size() != 0" checks to "players.size() != getBotCount()" --- Release/Plugins/RenX.Core.lib | Bin 188314 -> 188314 bytes RenX.Announcements/RenX_Announcements.cpp | 2 +- RenX.Commands/RenX_Commands.cpp | 4 ++-- RenX.Core/RenX_LadderDatabase.cpp | 2 +- RenX.IRCJoin/RenX_IRCJoin.cpp | 4 ++-- RenX.Ladder/RenX_Ladder.cpp | 2 +- RenX.Medals/RenX_Medals.cpp | 4 ++-- RenX.ModSystem/RenX_ModSystem.cpp | 4 ++-- 8 files changed, 11 insertions(+), 11 deletions(-) diff --git a/Release/Plugins/RenX.Core.lib b/Release/Plugins/RenX.Core.lib index ba038cab55bb4e02e5341bfde0639c4cd3e63945..86862dcef7e98f0fd78edb3e6fad0671eed73b39 100644 GIT binary patch delta 11348 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 OA3bHC0P;`ig#QP>QHE0h delta 11348 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 i++) { server = core->getServer(i); - if (server->players.size() != 0) + if (server->players.size() != server->getBotCount()) { msg = announcement; RenX::processTags(msg, server); diff --git a/RenX.Commands/RenX_Commands.cpp b/RenX.Commands/RenX_Commands.cpp index 45a811e..6aa5adf 100644 --- a/RenX.Commands/RenX_Commands.cpp +++ b/RenX.Commands/RenX_Commands.cpp @@ -332,7 +332,7 @@ void PlayersIRCCommand::trigger(IRC_Bot *source, const Jupiter::ReadableString & if (server->isLogChanType(type)) { noServers = false; - if (server->players.size() != 0) + if (server->players.size() != server->getBotCount()) { // End string containers Jupiter::DLList gStrings; @@ -488,7 +488,7 @@ void PlayerTableIRCCommand::trigger(IRC_Bot *source, const Jupiter::ReadableStri if (server->isLogChanType(type)) { noServers = false; - if (server->players.size() != 0) + if (server->players.size() != server->getBotCount()) { Jupiter::SLList gPlayers; Jupiter::SLList nPlayers; diff --git a/RenX.Core/RenX_LadderDatabase.cpp b/RenX.Core/RenX_LadderDatabase.cpp index ba0e9d8..c840a3f 100644 --- a/RenX.Core/RenX_LadderDatabase.cpp +++ b/RenX.Core/RenX_LadderDatabase.cpp @@ -369,7 +369,7 @@ void RenX::LadderDatabase::sort_entries() void RenX::LadderDatabase::updateLadder(RenX::Server *server, const RenX::TeamType &team, bool output_times) { - if (server->players.size() != 0) + if (server->players.size() != server->getBotCount()) { // update player stats in memory RenX::PlayerInfo *player; diff --git a/RenX.IRCJoin/RenX_IRCJoin.cpp b/RenX.IRCJoin/RenX_IRCJoin.cpp index cf86c4b..19e9e8b 100644 --- a/RenX.IRCJoin/RenX_IRCJoin.cpp +++ b/RenX.IRCJoin/RenX_IRCJoin.cpp @@ -58,7 +58,7 @@ void RenX_IRCJoinPlugin::OnJoin(Jupiter::IRC::Client *source, const Jupiter::Rea for (unsigned int i = 0; i != RenX::getCore()->getServerCount(); i++) { server = RenX::getCore()->getServer(i); - if (checkType() && (RenX_IRCJoinPlugin::joinMsgAlways || server->players.size() != 0)) + if (checkType() && (RenX_IRCJoinPlugin::joinMsgAlways || server->players.size() != server->getBotCount())) server->sendMessage(msg); } } @@ -94,7 +94,7 @@ void RenX_IRCJoinPlugin::OnPart(Jupiter::IRC::Client *source, const Jupiter::Rea for (unsigned int i = 0; i != RenX::getCore()->getServerCount(); i++) { server = RenX::getCore()->getServer(i); - if (checkType() && (RenX_IRCJoinPlugin::partMsgAlways || server->players.size() != 0)) + if (checkType() && (RenX_IRCJoinPlugin::partMsgAlways || server->players.size() != server->getBotCount())) server->sendMessage(msg); } } diff --git a/RenX.Ladder/RenX_Ladder.cpp b/RenX.Ladder/RenX_Ladder.cpp index 0c4b41b..dc97024 100644 --- a/RenX.Ladder/RenX_Ladder.cpp +++ b/RenX.Ladder/RenX_Ladder.cpp @@ -45,7 +45,7 @@ RenX_LadderPlugin::RenX_LadderPlugin() void RenX_LadderPlugin::RenX_OnGameOver(RenX::Server *server, RenX::WinType winType, const RenX::TeamType &team, int gScore, int nScore) { - if (server->hasSeenStart() && server->players.size() != 0) // the first game doesn't count! + if (server->hasSeenStart() && server->players.size() != server->getBotCount()) // the first game doesn't count! { char chr = static_cast(team); server->varData.set(this->name, "t"_jrs, Jupiter::ReferenceString(chr)); diff --git a/RenX.Medals/RenX_Medals.cpp b/RenX.Medals/RenX_Medals.cpp index e239727..5fac830 100644 --- a/RenX.Medals/RenX_Medals.cpp +++ b/RenX.Medals/RenX_Medals.cpp @@ -168,7 +168,7 @@ void RenX_MedalsPlugin::RenX_OnJoin(RenX::Server *server, const RenX::PlayerInfo void RenX_MedalsPlugin::RenX_OnGameOver(RenX::Server *server, RenX::WinType winType, const RenX::TeamType &team, int gScore, int nScore) { - if (server->hasSeenStart() && server->players.size() != 0) // No unfair medals for the first game! :D + if (server->hasSeenStart() && server->players.size() != server->getBotCount()) // No unfair medals for the first game! :D { Jupiter::DLList::Node *n = server->players.getNode(0); RenX::PlayerInfo *pInfo = n->data; @@ -290,7 +290,7 @@ void RenX_MedalsPlugin::init() for (unsigned int i = 0; i < sCount; i++) { server = core->getServer(i); - if (server->players.size() != 0) + if (server->players.size() != server->getBotCount()) { for (Jupiter::DLList::Node *n = server->players.getNode(0); n != nullptr; n = n->next) { diff --git a/RenX.ModSystem/RenX_ModSystem.cpp b/RenX.ModSystem/RenX_ModSystem.cpp index cb9f9b4..da12fc9 100644 --- a/RenX.ModSystem/RenX_ModSystem.cpp +++ b/RenX.ModSystem/RenX_ModSystem.cpp @@ -106,7 +106,7 @@ void RenX_ModSystemPlugin::init() while (total != 0) { server = core->getServer(--total); - if (server->players.size() != 0) + if (server->players.size() != server->getBotCount()) for (Jupiter::DLList::Node *n = server->players.getNode(0); n != nullptr; n = n->next) RenX_ModSystemPlugin::auth(server, n->data, true); } @@ -314,7 +314,7 @@ RenX_ModSystemPlugin::~RenX_ModSystemPlugin() while (total != 0) { server = core->getServer(--total); - if (server->players.size() != 0) + if (server->players.size() != server->getBotCount()) for (Jupiter::DLList::Node *n = server->players.getNode(0); n != nullptr; n = n->next) { player = n->data;