Current final tweaks to Shooter Game Mode
This commit is contained in:
@@ -8,8 +8,7 @@
|
||||
#include "openssl/sha.h"
|
||||
#include "GameLiftServerSDK.h"
|
||||
#include "GameLiftServerSDKModels.h"
|
||||
#include "DSP/BufferDiagnostics.h"
|
||||
#include "Misc/TypeContainer.h"
|
||||
|
||||
|
||||
|
||||
DEFINE_LOG_CATEGORY(LogShooterGameMode);
|
||||
@@ -32,7 +31,14 @@ void AShooterGameMode::InitGame(const FString& MapName, const FString& Options,
|
||||
{
|
||||
Super::InitGame(MapName, Options, ErrorMessage);
|
||||
CachedCommandLine = FCommandLine::Get();
|
||||
GameLiftConfig.ServerPort = cmdlineparser::details::GetConfiguredOrDefaultPort(CachedCommandLine, TEXT("port"));
|
||||
|
||||
const FPortResult PortResult = cmdlineparser::details::GetConfiguredOrDefaultPort(CachedCommandLine, TEXT("port"));;
|
||||
if (PortResult.bUsedDefaultPort)
|
||||
{
|
||||
UE_LOGFMT (LogShooterGameMode, Warning, "{0}", PortResult.WarningMessage);
|
||||
}
|
||||
|
||||
GameLiftConfig.ServerPort = PortResult.Port;
|
||||
if (FParse::Param(*CachedCommandLine, TEXT("glAnywhereFleet")))
|
||||
{
|
||||
UE_LOGFMT(LogShooterGameMode, Log, "Fleet type: Anywhere");
|
||||
@@ -59,7 +65,7 @@ FString AShooterGameMode::GetSHA256Hash(const FString& InString)
|
||||
|
||||
FTCHARToUTF8 Utf8(InString);
|
||||
const uint8* Bytes = reinterpret_cast<const uint8*>(Utf8.Get());
|
||||
uint32 Length = Utf8.Length() * sizeof(UTF8CHAR);
|
||||
uint32 Length = Utf8.Length();
|
||||
|
||||
|
||||
SHA256_CTX Sha256Context;
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -14,6 +14,7 @@ const TArray<FString>& cmdlineparser::details::ERROR_MESSAGES = []() -> const TA
|
||||
const TArray<FString>& cmdlineparser::details::CLI_TOKENS = []() -> const TArray<FString>&
|
||||
{
|
||||
static TArray<FString> Cli_Tokens;
|
||||
Cli_Tokens.Add(TEXT("unknown")); // Unknown = 0;
|
||||
Cli_Tokens.Add(TEXT("authtoken"));
|
||||
Cli_Tokens.Add(TEXT("hostid"));
|
||||
Cli_Tokens.Add(TEXT("fleetid"));
|
||||
@@ -24,6 +25,7 @@ const TArray<FString>& cmdlineparser::details::CLI_TOKENS = []() -> const TArray
|
||||
const TArray<FString>& cmdlineparser::details::REGEX_PATTERNS = []() -> const TArray<FString>&
|
||||
{
|
||||
static TArray<FString> Cli_Tokens;
|
||||
Cli_Tokens.Add(TEXT(".*")); // unknown = 0
|
||||
Cli_Tokens.Add(TEXT("^[a-zA-Z0-9\\-]+$"));
|
||||
Cli_Tokens.Add(TEXT("^[a-zA-Z0-9][a-zA-Z0-9\\-]{0,62}[a-zA-Z0-9]?$"));
|
||||
Cli_Tokens.Add(TEXT("^[a-z]*fleet-[a-zA-Z0-9\\-]+$|^arn:.*:[a-z]*fleet\\/[a-z]*fleet-[a-zA-Z0-9\\-]+$"));
|
||||
|
||||
Reference in New Issue
Block a user