diff --git a/Bot/IRC_Bot.cpp b/Bot/IRC_Bot.cpp index 1dea9d4..d919e1f 100644 --- a/Bot/IRC_Bot.cpp +++ b/Bot/IRC_Bot.cpp @@ -101,7 +101,7 @@ Jupiter::ArrayList IRC_Bot::getAccessCommands(Jupiter::IRC::Client:: return r; } -Jupiter::StringL IRC_Bot::getTriggers(Jupiter::ArrayList cmds) +Jupiter::StringL IRC_Bot::getTriggers(Jupiter::ArrayList &cmds) { Jupiter::StringL r; for (size_t i = 0; i < cmds.size(); i++) diff --git a/Bot/IRC_Bot.h b/Bot/IRC_Bot.h index b7123a4..c36c5cf 100644 --- a/Bot/IRC_Bot.h +++ b/Bot/IRC_Bot.h @@ -95,7 +95,7 @@ public: * @param cmds Commands to construct the string with. * @return A string containing the triggers of the commands in a space-deliminated list. */ - static Jupiter::StringL getTriggers(Jupiter::ArrayList cmds); + static Jupiter::StringL getTriggers(Jupiter::ArrayList &cmds); /** * @brief Reloads some settings. diff --git a/Release/Bot.lib b/Release/Bot.lib index d304427..9856839 100644 Binary files a/Release/Bot.lib and b/Release/Bot.lib differ diff --git a/Release/Plugins/RenX.Core.lib b/Release/Plugins/RenX.Core.lib index 0d0860f..ef01f97 100644 Binary files a/Release/Plugins/RenX.Core.lib and b/Release/Plugins/RenX.Core.lib differ diff --git a/RenX.Core/RenX.h b/RenX.Core/RenX.h index 57c16e7..e7b5546 100644 --- a/RenX.Core/RenX.h +++ b/RenX.Core/RenX.h @@ -47,6 +47,7 @@ namespace RenX Beacon, Tie, Shutdown, + Surrender, Unknown }; diff --git a/RenX.Core/RenX_Functions.cpp b/RenX.Core/RenX_Functions.cpp index ec82402..e03a6c5 100644 --- a/RenX.Core/RenX_Functions.cpp +++ b/RenX.Core/RenX_Functions.cpp @@ -53,6 +53,7 @@ Jupiter::ReferenceString baseWinTypeTranslation = "Conquest (Base Destruction)"; Jupiter::ReferenceString beaconWinTypeTranslation = "Espionage (Beacon)"; Jupiter::ReferenceString tieWinTypeTranslation = "Draw (Tie)"; Jupiter::ReferenceString shutdownWinTypeTranslation = "Ceasefire (Shutdown)"; +Jupiter::ReferenceString surrenderWinTypeTranslation = "Forfeit (Surrender)"; Jupiter::ReferenceString unknownWinTypeTranslation = "Aliens (Unknown)"; /** WinType plain translations */ @@ -795,6 +796,8 @@ const Jupiter::ReadableString &RenX::translateWinType(RenX::WinType winType) return tieWinTypeTranslation; case RenX::WinType::Shutdown: return shutdownWinTypeTranslation; + case RenX::WinType::Surrender: + return surrenderWinTypeTranslation; case RenX::WinType::Unknown: default: return unknownWinTypeTranslation; @@ -839,6 +842,7 @@ void RenX::initTranslations(Jupiter::INIFile &translationsFile) beaconWinTypeTranslation = translationsFile.get(STRING_LITERAL_AS_REFERENCE("WinType"), STRING_LITERAL_AS_REFERENCE("Beacon"), STRING_LITERAL_AS_REFERENCE("Espionage (Beacon)")); tieWinTypeTranslation = translationsFile.get(STRING_LITERAL_AS_REFERENCE("WinType"), STRING_LITERAL_AS_REFERENCE("Tie"), STRING_LITERAL_AS_REFERENCE("Draw (Tie)")); shutdownWinTypeTranslation = translationsFile.get(STRING_LITERAL_AS_REFERENCE("WinType"), STRING_LITERAL_AS_REFERENCE("Shutdown"), STRING_LITERAL_AS_REFERENCE("Ceasefire (Shutdown)")); + surrenderWinTypeTranslation = translationsFile.get(STRING_LITERAL_AS_REFERENCE("WinType"), STRING_LITERAL_AS_REFERENCE("Surrender"), STRING_LITERAL_AS_REFERENCE("Forfeit (Surrender)")); unknownWinTypeTranslation = translationsFile.get(STRING_LITERAL_AS_REFERENCE("WinType"), STRING_LITERAL_AS_REFERENCE("Unknown"), STRING_LITERAL_AS_REFERENCE("Aliens (Unknown)")); scoreWinTypePlainTranslation = translationsFile.get(STRING_LITERAL_AS_REFERENCE("WinTypePlain"), STRING_LITERAL_AS_REFERENCE("Score"), STRING_LITERAL_AS_REFERENCE("High Score")); diff --git a/RenX.Core/RenX_Server.cpp b/RenX.Core/RenX_Server.cpp index 04d5e16..10456fb 100644 --- a/RenX.Core/RenX_Server.cpp +++ b/RenX.Core/RenX_Server.cpp @@ -1957,6 +1957,8 @@ void RenX::Server::processLine(const Jupiter::ReadableString &line) winType = WinType::Base; else if (sWinType.equals("triggered")) winType = WinType::Shutdown; + else if (sWinType.equals("Surrender")) + winType = WinType::Surrender; TeamType team = RenX::getTeam(tokens.getToken(3));