From b0da2930f79d67efdf62e3a3303fa556fff815ba Mon Sep 17 00:00:00 2001 From: JAJames Date: Sat, 6 Aug 2016 16:51:26 -0400 Subject: [PATCH] RenX.Server: Made a temp fix to getBotCount() until I can figure out why bot_count is incorrect RenX.ServerList: Fixed a Unicode related bug --- Release/Bot.lib | Bin 24276 -> 24276 bytes Release/Plugins/RenX.Core.lib | Bin 208484 -> 208484 bytes RenX.Core/RenX_Server.cpp | 17 ++++++++++++----- RenX.ServerList/RenX_ServerList.cpp | 18 ++++++++---------- 4 files changed, 20 insertions(+), 15 deletions(-) diff --git a/Release/Bot.lib b/Release/Bot.lib index 187a4903666a71f6ab2fe2283077e03bf8b3572f..d652ed9d18eb687248e5e163d096a0f9c830650f 100644 GIT binary patch delta 1708 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౼yS)a45Y$Ew;A#Y*Da;wPTH)a{h+b1Yda|n7vUh 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 zmy4b>(players.size(); ++index) + if (this->players.get(index)->isBot) + ++count; + + return count; + //return RenX::Server::bot_count; } RenX::PlayerInfo *RenX::Server::getPlayer(int id) const @@ -732,7 +739,7 @@ bool RenX::Server::updateClientList() RenX::Server::lastClientListUpdate = std::chrono::steady_clock::now(); int r = 0; - if (RenX::Server::players.size() != RenX::Server::bot_count) + if (RenX::Server::players.size() != this->getBotCount()) { if (this->rconVersion >= 4) r = RenX::Server::sock.send(STRING_LITERAL_AS_REFERENCE("cclientvarlist ID SCORE CREDITS PING\n")) > 0; @@ -740,7 +747,7 @@ bool RenX::Server::updateClientList() r = RenX::Server::sock.send(STRING_LITERAL_AS_REFERENCE("cclientvarlist ID\xA0""SCORE\xA0""CREDITS\xA0""PING\n")) > 0; } - if (RenX::Server::bot_count != 0) + if (this->getBotCount() != 0) { if (this->rconVersion >= 4) r |= RenX::Server::sock.send(STRING_LITERAL_AS_REFERENCE("cbotvarlist ID SCORE CREDITS\n")) > 0; @@ -785,7 +792,7 @@ bool RenX::Server::gameoverStop() void RenX::Server::gameoverWhenEmpty() { - if (this->players.size() == this->bot_count) + if (this->players.size() == this->getBotCount()) this->gameover(); else this->gameover_when_empty = true; @@ -2673,7 +2680,7 @@ void RenX::Server::processLine(const Jupiter::ReadableString &line) this->removePlayer(player); } - if (this->gameover_when_empty && this->players.size() == this->bot_count) + if (this->gameover_when_empty && this->players.size() == this->getBotCount()) this->gameover(); } else if (subHeader.equals("Kick;")) diff --git a/RenX.ServerList/RenX_ServerList.cpp b/RenX.ServerList/RenX_ServerList.cpp index dc8b201..1772473 100644 --- a/RenX.ServerList/RenX_ServerList.cpp +++ b/RenX.ServerList/RenX_ServerList.cpp @@ -36,11 +36,11 @@ const Jupiter::ReferenceString server_list_game_footer = "\n"_jrs; Jupiter::String jsonify(const Jupiter::ReadableString &in_str) { - const char *ptr = in_str.ptr(); - size_t str_length = in_str.size(); - Jupiter::String result(str_length); + const unsigned char *ptr = reinterpret_cast(in_str.ptr()); + const unsigned char *end_ptr = ptr + in_str.size(); + Jupiter::String result(in_str.size()); - while (str_length != 0) + while (ptr < end_ptr) { if (*ptr == '\\') // backslash { @@ -82,7 +82,6 @@ Jupiter::String jsonify(const Jupiter::ReadableString &in_str) result += *ptr; ++ptr; - --str_length; } return result; @@ -90,11 +89,11 @@ Jupiter::String jsonify(const Jupiter::ReadableString &in_str) Jupiter::String sanitize_game(const Jupiter::ReadableString &in_str) { - const char *ptr = in_str.ptr(); - size_t str_length = in_str.size(); - Jupiter::String result(str_length); + const unsigned char *ptr = reinterpret_cast(in_str.ptr()); + const unsigned char *end_ptr = ptr + in_str.size(); + Jupiter::String result(in_str.size()); - while (str_length != 0) + while (ptr < end_ptr != 0) { if (*ptr == '\\') // backslash { @@ -140,7 +139,6 @@ Jupiter::String sanitize_game(const Jupiter::ReadableString &in_str) result += *ptr; ++ptr; - --str_length; } return result;