From 96913fce6702edcb1682f7eae2c344cda06ff732 Mon Sep 17 00:00:00 2001 From: JustinAJ Date: Tue, 5 May 2015 19:47:34 -0400 Subject: [PATCH] Removed "server" parameter from uuid_func. --- Release/Plugins/RenX.Core.lib | Bin 114384 -> 114264 bytes RenX.Core/RenX_Functions.cpp | 4 ++-- RenX.Core/RenX_Functions.h | 2 +- RenX.Core/RenX_Server.cpp | 10 +++++----- RenX.Core/RenX_Server.h | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Release/Plugins/RenX.Core.lib b/Release/Plugins/RenX.Core.lib index 8c253b4c61e014cc4531bf8edb5fee926e47def8..cc305ccaf52faae88123751705b253dd4e79c0c8 100644 GIT binary patch delta 10184 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 } -Jupiter::StringS RenX::default_uuid_func(RenX::Server *server, RenX::PlayerInfo *player) +Jupiter::StringS RenX::default_uuid_func(RenX::PlayerInfo *player) { - return server->formatSteamID(player); + return Jupiter::StringS::Format("0x%.16llX", player->steamid); } double RenX::getKillDeathRatio(const RenX::PlayerInfo *player, bool includeSuicides) diff --git a/RenX.Core/RenX_Functions.h b/RenX.Core/RenX_Functions.h index b14f239..9deb647 100644 --- a/RenX.Core/RenX_Functions.h +++ b/RenX.Core/RenX_Functions.h @@ -159,7 +159,7 @@ namespace RenX * @param player Player to calculate UUID of * @return UUID of the player based on their steam ID. */ - RENX_API Jupiter::StringS default_uuid_func(RenX::Server *server, RenX::PlayerInfo *player); + RENX_API Jupiter::StringS default_uuid_func(RenX::PlayerInfo *player); /** * @brief Calculates a player's Kill-Death ratio, based on their data. diff --git a/RenX.Core/RenX_Server.cpp b/RenX.Core/RenX_Server.cpp index cd0a9e5..c695c4e 100644 --- a/RenX.Core/RenX_Server.cpp +++ b/RenX.Core/RenX_Server.cpp @@ -622,7 +622,7 @@ void RenX::Server::setUUIDFunction(RenX::Server::uuid_func func) Jupiter::DLList::Node *node = RenX::Server::players.getNode(0); do { - RenX::Server::setUUIDIfDifferent(node->data, RenX::Server::calc_uuid(this, node->data)); + RenX::Server::setUUIDIfDifferent(node->data, RenX::Server::calc_uuid(node->data)); node = node->next; } while (node != nullptr); @@ -916,7 +916,7 @@ void RenX::Server::processLine(const Jupiter::ReadableString &line) if (id != 0) this->players.add(r); - r->uuid = calc_uuid(this, r); + r->uuid = calc_uuid(r); for (size_t i = 0; i < xPlugins.size(); i++) xPlugins.get(i)->RenX_OnPlayerCreate(this, r); @@ -943,7 +943,7 @@ void RenX::Server::processLine(const Jupiter::ReadableString &line) } if (recalcUUID) { - this->setUUIDIfDifferent(r, calc_uuid(this, r)); + this->setUUIDIfDifferent(r, calc_uuid(r)); if (banCheck(r)) this->kickPlayer(r); } @@ -1078,7 +1078,7 @@ void RenX::Server::processLine(const Jupiter::ReadableString &line) if (calc_uuid == RenX::default_uuid_func) setUUID(player, this->formatSteamID(steamid)); else - this->setUUIDIfDifferent(player, calc_uuid(this, player)); + this->setUUIDIfDifferent(player, calc_uuid(player)); } } @@ -1113,7 +1113,7 @@ void RenX::Server::processLine(const Jupiter::ReadableString &line) if (calc_uuid == RenX::default_uuid_func) setUUID(player, this->formatSteamID(steamid)); else - this->setUUIDIfDifferent(player, calc_uuid(this, player)); + this->setUUIDIfDifferent(player, calc_uuid(player)); } } diff --git a/RenX.Core/RenX_Server.h b/RenX.Core/RenX_Server.h index 1085839..7e7e8ca 100644 --- a/RenX.Core/RenX_Server.h +++ b/RenX.Core/RenX_Server.h @@ -623,7 +623,7 @@ namespace RenX * @param player Player to calculate UUID of * @return UUID calculated from player. */ - typedef Jupiter::StringS(*uuid_func)(RenX::Server *server, RenX::PlayerInfo *player); + typedef Jupiter::StringS(*uuid_func)(RenX::PlayerInfo *player); /** * @brief Sets the player UUID calculation function.