Browse Source

Fixed a minor bug in the "mods" game command; minor cleanups

pull/3/head
JustinAJ 10 years ago
parent
commit
624aae9917
  1. 10
      RenX.Commands/RenX_Commands.cpp

10
RenX.Commands/RenX_Commands.cpp

@ -708,7 +708,7 @@ void ModsIRCCommand::trigger(IRC_Bot *source, const Jupiter::ReadableString &cha
for (Jupiter::DLList<RenX::PlayerInfo>::Node *node = server->players.getNode(0); node != nullptr; node = node->next) for (Jupiter::DLList<RenX::PlayerInfo>::Node *node = server->players.getNode(0); node != nullptr; node = node->next)
{ {
player = node->data; player = node->data;
if (player->isBot == false && (player->adminType.size() != 0 || (player->access != 0 && (player->gamePrefix.isEmpty() == false || player->formatNamePrefix.isEmpty() == false)))) if (player->isBot == false && (player->adminType.isEmpty() == false || (player->access != 0 && (player->gamePrefix.isEmpty() == false || player->formatNamePrefix.isEmpty() == false))))
{ {
if (msg.size() != 0) msg += ", "; if (msg.size() != 0) msg += ", ";
else msg += "Moderators in-game: "; else msg += "Moderators in-game: ";
@ -2023,13 +2023,15 @@ void ModsGameCommand::trigger(RenX::Server *source, RenX::PlayerInfo *, const Ju
player = node->data; player = node->data;
if (player->isBot == false && (player->adminType.size() != 0 || (player->access != 0 && (player->gamePrefix.isEmpty() == false || player->formatNamePrefix.isEmpty() == false)))) if (player->isBot == false && (player->adminType.size() != 0 || (player->access != 0 && (player->gamePrefix.isEmpty() == false || player->formatNamePrefix.isEmpty() == false))))
{ {
if (msg.size() != 4) msg += ", "; if (msg.isEmpty())
else msg += "Moderators in-game: "; msg = "Moderators in-game: ";
else
msg += ", ";
msg += player->gamePrefix; msg += player->gamePrefix;
msg += player->name; msg += player->name;
} }
} }
if (msg.size() == 4) if (msg.isEmpty())
{ {
msg += "No moderators are in-game"; msg += "No moderators are in-game";
RenX::GameCommand *cmd = source->getCommand(STRING_LITERAL_AS_REFERENCE("modrequest")); RenX::GameCommand *cmd = source->getCommand(STRING_LITERAL_AS_REFERENCE("modrequest"));

Loading…
Cancel
Save