Current final tweaks to Shooter Game Mode

This commit is contained in:
Norman Lansing
2026-03-14 19:38:13 -04:00
parent 6afd336bbf
commit 7f14cad36f
6 changed files with 41 additions and 21 deletions

View File

@@ -1,11 +1,11 @@
#include "GameLift/GameLiftClp.h"
int32 cmdlineparser::GetConfiguredOrDefaultPort(const FString& Token)
FPortResult cmdlineparser::GetConfiguredOrDefaultPort(const FString& Token)
{
return details::GetConfiguredOrDefaultPort(FCommandLine::Get(), Token);
}
int32 cmdlineparser::GetConfiguredOrDefaultPort(const FString& CommandLine, const FString& Token)
FPortResult cmdlineparser::GetConfiguredOrDefaultPort(const FString& CommandLine, const FString& Token)
{
return details::GetConfiguredOrDefaultPort(CommandLine, Token);
}
@@ -16,6 +16,7 @@ cmdlineparser::details::FParseResult cmdlineparser::GetValueOfToken(const FStrin
FString ValueOfToken;
Result.Token = Token;
ensure(Token != details::EAvailableTokens::Unknown);
ensure(Token < details::EAvailableTokens::MaxToken);
const bool bTokenFound = FParse::Value(
*CommandLine,
@@ -58,7 +59,6 @@ cmdlineparser::details::FParseResult cmdlineparser::GetValueOfToken(const FStrin
FString ErrorMessage = details::ERROR_MESSAGES[static_cast<int32>(Result.ErrorCode)];
FString TokenName = details::CLI_TOKENS[static_cast<int32>(Result.Token)];
FString Value = Result.Value;
// Result.ErrorMessage = FString::Format(*ErrorMessage, {FStringFormatArg(TokenName), FStringFormatArg(Value)});
Result.ErrorMessage = ErrorMessage;
return Result;
@@ -72,18 +72,24 @@ FString cmdlineparser::details::EnsureEndsWith(const FString& Token, const TCHAR
return Token.EndsWith(Suffix) ? Token : Token + Suffix;
}
int32 cmdlineparser::details::GetConfiguredOrDefaultPort(const FString& CommandLine, const FString& Token)
FPortResult cmdlineparser::details::GetConfiguredOrDefaultPort(const FString& CommandLine, const FString& Token)
{
const int32 Port = FURL::UrlConfig.DefaultPort;
FPortResult PortResult;
PortResult.Port = FURL::UrlConfig.DefaultPort;
if (int32 CliPort; FParse::Value(*CommandLine, *EnsureEndsWith(Token, TEXT("=")), CliPort))
{
if (CliPort >= details::MIN_PORT && CliPort <= details::MAX_PORT)
{
return CliPort;
PortResult.Port = CliPort;
PortResult.bUsedDefaultPort = false;
PortResult.WarningMessage = FString();
return PortResult;
}
}
return Port;
PortResult.bUsedDefaultPort = true;
PortResult.WarningMessage = FString("Command Line Option for Port is out of ranged... Using Default Port %s", PortResult.Port);
return PortResult;
}
bool cmdlineparser::details::DoesRegExMatch(const FString& Text, const FString& Pattern)