From 8efaa27e7452545b333f3853932700b998d8aac5 Mon Sep 17 00:00:00 2001 From: JustinAJ Date: Thu, 23 Oct 2014 05:38:47 -0400 Subject: [PATCH] Updated Jupiter version; adjusted accordingly. --- Jupiter | 2 +- Release/Bot.lib | Bin 19858 -> 19858 bytes Release/Plugins/RenX.Core.lib | Bin 61562 -> 61562 bytes RenX.Core/RenX_Server.cpp | 4 ++-- RenX.Medals/RenX_Medals.cpp | 8 ++++---- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Jupiter b/Jupiter index b5d253d..911d3fc 160000 --- a/Jupiter +++ b/Jupiter @@ -1 +1 @@ -Subproject commit b5d253da72553929b18a805c01fc2999568d99e3 +Subproject commit 911d3fc122e33f58e96ba2325eabd41e633105f0 diff --git a/Release/Bot.lib b/Release/Bot.lib index 2e4891d50e084d3a008c6aa2fb06d9c778f574df..8995d41a1eacc86dcfe183123eb8ceadcc12cb61 100644 GIT binary patch delta 1646 zcmZuxOH30{6r}-Dz5(pe3J7g2AF%;u=x6#bEd@#`1`Tng@(CD~L?toCxDj@;Ai>^^ zhDc*vxH5qd7H-@cjY%;vF)j$YFeYwD~9~?LGGolg_ijx1PFk#3y&a-DiiByT{90jxZ75et z1kDm0Ds3WVQ)Ltf=}0J5P1v&nmQ;&IgXx3~p7vX)w=nX`DNlkze?;S8OmN1-OvF7& z5#I1fHDoF$R+_N~OgXLa(PI}m+E`s)!&vB_PW!|g64?jE5X`=S2xB8^ku<6$ls!wS3A)R=|Rp9eCUiUD^9IZmQ}7-TZ}AXkT_m<^7DOr|b0XOMXm zV)%=YVV;UGld*@dXmp~kZDT9Uw?WO+Mp$~im|hb}Z?UQoLhTJO*U#SPq`NgQvB_1_@(ZgBWE=W5uVfRRltjIjFUkqewlramm<=Jb7zlYaR$=ijOa(u`!)pWy=!o3jB_~KKUcBJ^pV(qQ)ILj%9L;0TN7D#D! ZoRxN9X#h(VM_Xm`)}7w@d-Ek#{{Xeh);$0K delta 1646 zcmZuxOH30{6m0{fd;{3h5fIv1K4JrO`kVesOQEF{gNC?L`2>tgqLR2UZiJmINU(RK zA<`HZu1p|=g&VgAB~gd+wbnY#0k0#`SiS zH>7wximxze-3}I8gvXuZme=AlymvKKcvdny`>r2GjVHmk{>CcAr*^?LXoJ%OU$sAb zXhGj#n^0hd8Mmd56!aR%uM$2;b||{fXk}Jt@>xhJ{B*}fI43iBRvr@JH!>6KM7atg zXtKbO+$mDF6h^U=j)YR%iao1gSuv|Lm`O_T%wwkBBFL+vJPVXOQI&%+!8tE8k?^KO zc++dCCsR4F(u6%=+F^x{UYp2K$LjUz#zOye+NZv-$UZEGVDbk=7#mTGq*0xrve4QF zpS(OhuqzUj{ATLKg_L^YLHjozKD|rTg4)B;!_B^FdD5D}3 zbEWWGMVFC1$Y3SNty5#u<7P^K5zMJ7I@}TBIEngEh{+T~TpgC<5}bsXOk;RnC-XSW z@RwoTJk=2T1Uk#FA*S7&)MlAUG9PQnDXzPhmf&xa>E1-$F4R40 zpM!@f?F5M@>`k*NrEc(Aa++$N#bK=v&RauXogC`*!qTu4n$j^{m74TQTC3ViGk3q! zw>g(|UL9ebiz8ZkTceB{8okT8Dz-0RWK)Y7R=<+D#JObZqcU#FKHxa%SIjd0ZuXXn zlk19(vF||?hjNoE+Uz?ECCe#TAJbov`c52-@!JP?j`_Ws`+s^TIV}g0Dr(SgLO(Y1 z;YKc2^?=i_ZG>?4%N#dy{KzrZ_rbBuy%5j%;!~L}qy)%fZ5{9=&ndb?`JU$%NNIk8 Xm3Cuk5KCoyXHDwPy@7@M3x?W%L%+2* diff --git a/Release/Plugins/RenX.Core.lib b/Release/Plugins/RenX.Core.lib index d2a60138f52a94380435510aee68c5994aec5554..d9ef84143d9aaad89388538da5263c9a50c30bef 100644 GIT binary patch delta 3930 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 diff --git a/RenX.Core/RenX_Server.cpp b/RenX.Core/RenX_Server.cpp index 79ed003..b3ea9a9 100644 --- a/RenX.Core/RenX_Server.cpp +++ b/RenX.Core/RenX_Server.cpp @@ -1135,13 +1135,13 @@ void RenX::Server::init() RenX::Server::addCommand(cmd); 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) cmd->setAccessLevel(accessLevel.asInt()); } 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); while (j != 0) cmd->addTrigger(Jupiter::ReferenceString::getWord(aliasList, --j, WHITESPACE)); diff --git a/RenX.Medals/RenX_Medals.cpp b/RenX.Medals/RenX_Medals.cpp index 9f68057..6eedd45 100644 --- a/RenX.Medals/RenX_Medals.cpp +++ b/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); if (section != nullptr) { - while (section->hasKey(STRING_LITERAL_AS_REFERENCE("MaxRecs")) && section->getValue(STRING_LITERAL_AS_REFERENCE("MaxRecs")).asInt() < worth) - if ((section = RenX_MedalsPlugin::joinMessageFile.getSection(section->getValue(STRING_LITERAL_AS_REFERENCE("NextSection")))) == nullptr) + while (section->hasKey(STRING_LITERAL_AS_REFERENCE("MaxRecs")) && section->get(STRING_LITERAL_AS_REFERENCE("MaxRecs")).asInt() < worth) + if ((section = RenX_MedalsPlugin::joinMessageFile.getSection(section->get(STRING_LITERAL_AS_REFERENCE("NextSection")))) == nullptr) return; // No matching section found. 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]")); else { - unsigned int recs = section->getValue(STRING_LITERAL_AS_REFERENCE("Recs")).asUnsignedInt(); - unsigned int noobs = section->getValue(STRING_LITERAL_AS_REFERENCE("Noobs")).asUnsignedInt(); + unsigned int recs = section->get(STRING_LITERAL_AS_REFERENCE("Recs")).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)); } }