From d29448fa798da8d4a486105349aba5e8f226158a Mon Sep 17 00:00:00 2001 From: JustinAJ Date: Sat, 30 May 2015 01:56:50 -0400 Subject: [PATCH] Added ServerPrefix (Default: {SERVERPREFIX}) tag. --- Release/Plugins/RenX.Core.lib | Bin 125108 -> 125108 bytes RenX.Core/RenX_Tags.cpp | 4 ++++ RenX.Core/RenX_Tags.h | 2 ++ 3 files changed, 6 insertions(+) diff --git a/Release/Plugins/RenX.Core.lib b/Release/Plugins/RenX.Core.lib index b97b55e8fde412f138abf47782ba48e315142b4d..351b3936676306f6f40d344e3171eabd4a7855e0 100644 GIT binary patch delta 8164 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 A^#A|> delta 8164 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 = this->getUniqueInternalTag(); this->INTERNAL_SOCKET_HOSTNAME_TAG = this->getUniqueInternalTag(); this->INTERNAL_SOCKET_PORT_TAG = this->getUniqueInternalTag(); + this->INTERNAL_SERVER_PREFIX_TAG = this->getUniqueInternalTag(); /** Player tags*/ this->INTERNAL_NAME_TAG = this->getUniqueInternalTag(); @@ -171,6 +172,7 @@ TagsImp::TagsImp() this->serverPortTag = Jupiter::IRC::Client::Config->get(configSection, STRING_LITERAL_AS_REFERENCE("ServerPortTag"), STRING_LITERAL_AS_REFERENCE("{SERVERPORT}")); this->socketHostnameTag = Jupiter::IRC::Client::Config->get(configSection, STRING_LITERAL_AS_REFERENCE("SocketHostnameTag"), STRING_LITERAL_AS_REFERENCE("{SOCKHOST}")); this->socketPortTag = Jupiter::IRC::Client::Config->get(configSection, STRING_LITERAL_AS_REFERENCE("SocketPortTag"), STRING_LITERAL_AS_REFERENCE("{SOCKPORT}")); + this->serverPrefixTag = Jupiter::IRC::Client::Config->get(configSection, STRING_LITERAL_AS_REFERENCE("ServerPrefixTag"), STRING_LITERAL_AS_REFERENCE("{SERVERPREFIX}")); /** Player tags */ this->nameTag = Jupiter::IRC::Client::Config->get(configSection, STRING_LITERAL_AS_REFERENCE("NameTag"), STRING_LITERAL_AS_REFERENCE("{NAME}")); @@ -267,6 +269,7 @@ void TagsImp::processTags(Jupiter::StringType &msg, const RenX::Server *server, msg.replace(this->INTERNAL_SERVER_PORT_TAG, Jupiter::StringS::Format("%u", server->getPort())); msg.replace(this->INTERNAL_SOCKET_HOSTNAME_TAG, server->getSocketHostname()); msg.replace(this->INTERNAL_SOCKET_PORT_TAG, Jupiter::StringS::Format("%u", server->getSocketPort())); + msg.replace(this->INTERNAL_SERVER_PREFIX_TAG, server->getPrefix()); if (player != nullptr) { msg.replace(this->INTERNAL_STEAM_TAG, server->formatSteamID(player)); @@ -369,6 +372,7 @@ void TagsImp::sanitizeTags(Jupiter::StringType &fmt) fmt.replace(this->serverPortTag, this->INTERNAL_SERVER_PORT_TAG); fmt.replace(this->socketHostnameTag, this->INTERNAL_SOCKET_HOSTNAME_TAG); fmt.replace(this->socketPortTag, this->INTERNAL_SOCKET_PORT_TAG); + fmt.replace(this->serverPrefixTag, this->INTERNAL_SERVER_PREFIX_TAG); /** Player tags */ fmt.replace(this->nameTag, this->INTERNAL_NAME_TAG); diff --git a/RenX.Core/RenX_Tags.h b/RenX.Core/RenX_Tags.h index 2d970d5..c7f96c8 100644 --- a/RenX.Core/RenX_Tags.h +++ b/RenX.Core/RenX_Tags.h @@ -64,6 +64,7 @@ namespace RenX Jupiter::StringS INTERNAL_SERVER_PORT_TAG; Jupiter::StringS INTERNAL_SOCKET_HOSTNAME_TAG; Jupiter::StringS INTERNAL_SOCKET_PORT_TAG; + Jupiter::StringS INTERNAL_SERVER_PREFIX_TAG; /** Player tags */ Jupiter::StringS INTERNAL_NAME_TAG; @@ -160,6 +161,7 @@ namespace RenX Jupiter::StringS serverPortTag; Jupiter::StringS socketHostnameTag; Jupiter::StringS socketPortTag; + Jupiter::StringS serverPrefixTag; /** Player tags */ Jupiter::StringS nameTag;