Browse Source

Updated Jupiter version; adjusted accordingly.

pull/3/head
JustinAJ 10 years ago
parent
commit
8efaa27e74
  1. 2
      Jupiter
  2. BIN
      Release/Bot.lib
  3. BIN
      Release/Plugins/RenX.Core.lib
  4. 4
      RenX.Core/RenX_Server.cpp
  5. 8
      RenX.Medals/RenX_Medals.cpp

2
Jupiter

@ -1 +1 @@
Subproject commit b5d253da72553929b18a805c01fc2999568d99e3 Subproject commit 911d3fc122e33f58e96ba2325eabd41e633105f0

BIN
Release/Bot.lib

Binary file not shown.

BIN
Release/Plugins/RenX.Core.lib

Binary file not shown.

4
RenX.Core/RenX_Server.cpp

@ -1135,13 +1135,13 @@ void RenX::Server::init()
RenX::Server::addCommand(cmd); RenX::Server::addCommand(cmd);
if (commandAccessLevels != nullptr) if (commandAccessLevels != nullptr)
{ {
const Jupiter::ReadableString &accessLevel = RenX::Server::commandAccessLevels->getValue(cmd->getTrigger()); const Jupiter::ReadableString &accessLevel = RenX::Server::commandAccessLevels->get(cmd->getTrigger());
if (accessLevel.isEmpty() == false) if (accessLevel.isEmpty() == false)
cmd->setAccessLevel(accessLevel.asInt()); cmd->setAccessLevel(accessLevel.asInt());
} }
if (commandAliases != nullptr) if (commandAliases != nullptr)
{ {
const Jupiter::ReadableString &aliasList = RenX::Server::commandAliases->getValue(cmd->getTrigger()); const Jupiter::ReadableString &aliasList = RenX::Server::commandAliases->get(cmd->getTrigger());
j = aliasList.wordCount(WHITESPACE); j = aliasList.wordCount(WHITESPACE);
while (j != 0) while (j != 0)
cmd->addTrigger(Jupiter::ReferenceString::getWord(aliasList, --j, WHITESPACE)); cmd->addTrigger(Jupiter::ReferenceString::getWord(aliasList, --j, WHITESPACE));

8
RenX.Medals/RenX_Medals.cpp

@ -109,8 +109,8 @@ void RenX_MedalsPlugin::RenX_OnJoin(RenX::Server *server, const RenX::PlayerInfo
Jupiter::INIFile::Section *section = RenX_MedalsPlugin::joinMessageFile.getSection(RenX_MedalsPlugin::firstSection); Jupiter::INIFile::Section *section = RenX_MedalsPlugin::joinMessageFile.getSection(RenX_MedalsPlugin::firstSection);
if (section != nullptr) if (section != nullptr)
{ {
while (section->hasKey(STRING_LITERAL_AS_REFERENCE("MaxRecs")) && section->getValue(STRING_LITERAL_AS_REFERENCE("MaxRecs")).asInt() < worth) while (section->hasKey(STRING_LITERAL_AS_REFERENCE("MaxRecs")) && section->get(STRING_LITERAL_AS_REFERENCE("MaxRecs")).asInt() < worth)
if ((section = RenX_MedalsPlugin::joinMessageFile.getSection(section->getValue(STRING_LITERAL_AS_REFERENCE("NextSection")))) == nullptr) if ((section = RenX_MedalsPlugin::joinMessageFile.getSection(section->get(STRING_LITERAL_AS_REFERENCE("NextSection")))) == nullptr)
return; // No matching section found. return; // No matching section found.
if (section->hasKey(STRING_LITERAL_AS_REFERENCE("1"))) if (section->hasKey(STRING_LITERAL_AS_REFERENCE("1")))
@ -289,8 +289,8 @@ void RecsGameCommand::trigger(RenX::Server *source, RenX::PlayerInfo *player, co
source->sendMessage(player, STRING_LITERAL_AS_REFERENCE("Error: Player not found! Syntax: recs [player]")); source->sendMessage(player, STRING_LITERAL_AS_REFERENCE("Error: Player not found! Syntax: recs [player]"));
else else
{ {
unsigned int recs = section->getValue(STRING_LITERAL_AS_REFERENCE("Recs")).asUnsignedInt(); unsigned int recs = section->get(STRING_LITERAL_AS_REFERENCE("Recs")).asUnsignedInt();
unsigned int noobs = section->getValue(STRING_LITERAL_AS_REFERENCE("Noobs")).asUnsignedInt(); unsigned int noobs = section->get(STRING_LITERAL_AS_REFERENCE("Noobs")).asUnsignedInt();
source->sendMessage(player, Jupiter::StringS::Format("[Archive] %.*s has %u and %u n00bs. Their worth: %d", section->getName().size(), section->getName().ptr(), recs, noobs, recs - noobs)); source->sendMessage(player, Jupiter::StringS::Format("[Archive] %.*s has %u and %u n00bs. Their worth: %d", section->getName().size(), section->getName().ptr(), recs, noobs, recs - noobs));
} }
} }

Loading…
Cancel
Save