nlansing/DedicatedServerCourse
Template
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Current final tweaks to Shooter Game Mode

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

14
Source/FPSTemplate/Private/Game/ShooterGameMode.cpp
View File

@@ -8,8 +8,7 @@
#include "openssl/sha.h" #include "openssl/sha.h"
#include "GameLiftServerSDK.h" #include "GameLiftServerSDK.h"
#include "GameLiftServerSDKModels.h" #include "GameLiftServerSDKModels.h"
#include "DSP/BufferDiagnostics.h"
#include "Misc/TypeContainer.h"
DEFINE_LOG_CATEGORY(LogShooterGameMode); DEFINE_LOG_CATEGORY(LogShooterGameMode);
@@ -32,7 +31,14 @@ void AShooterGameMode::InitGame(const FString& MapName, const FString& Options,
{ {
Super::InitGame(MapName, Options, ErrorMessage); Super::InitGame(MapName, Options, ErrorMessage);
CachedCommandLine = FCommandLine::Get(); 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"))) if (FParse::Param(*CachedCommandLine, TEXT("glAnywhereFleet")))
{ {
UE_LOGFMT(LogShooterGameMode, Log, "Fleet type: Anywhere"); UE_LOGFMT(LogShooterGameMode, Log, "Fleet type: Anywhere");
@@ -59,7 +65,7 @@ FString AShooterGameMode::GetSHA256Hash(const FString& InString)
FTCHARToUTF8 Utf8(InString); FTCHARToUTF8 Utf8(InString);
const uint8* Bytes = reinterpret_cast<const uint8*>(Utf8.Get()); const uint8* Bytes = reinterpret_cast<const uint8*>(Utf8.Get());
uint32 Length = Utf8.Length() * sizeof(UTF8CHAR); uint32 Length = Utf8.Length();
SHA256_CTX Sha256Context; SHA256_CTX Sha256Context;

20
Source/FPSTemplate/Private/GameLift/GameLiftClp.cpp
View File

@@ -1,11 +1,11 @@
#include "GameLift/GameLiftClp.h" #include "GameLift/GameLiftClp.h"
int32 cmdlineparser::GetConfiguredOrDefaultPort(const FString& Token) FPortResult cmdlineparser::GetConfiguredOrDefaultPort(const FString& Token)
{ {
return details::GetConfiguredOrDefaultPort(FCommandLine::Get(), 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); return details::GetConfiguredOrDefaultPort(CommandLine, Token);
} }
@@ -16,6 +16,7 @@ cmdlineparser::details::FParseResult cmdlineparser::GetValueOfToken(const FStrin
FString ValueOfToken; FString ValueOfToken;
Result.Token = Token; Result.Token = Token;
ensure(Token != details::EAvailableTokens::Unknown);
ensure(Token < details::EAvailableTokens::MaxToken); ensure(Token < details::EAvailableTokens::MaxToken);
const bool bTokenFound = FParse::Value( const bool bTokenFound = FParse::Value(
*CommandLine, *CommandLine,
@@ -58,7 +59,6 @@ cmdlineparser::details::FParseResult cmdlineparser::GetValueOfToken(const FStrin
FString ErrorMessage = details::ERROR_MESSAGES[static_cast<int32>(Result.ErrorCode)]; FString ErrorMessage = details::ERROR_MESSAGES[static_cast<int32>(Result.ErrorCode)];
FString TokenName = details::CLI_TOKENS[static_cast<int32>(Result.Token)]; FString TokenName = details::CLI_TOKENS[static_cast<int32>(Result.Token)];
FString Value = Result.Value; FString Value = Result.Value;
// Result.ErrorMessage = FString::Format(*ErrorMessage, {FStringFormatArg(TokenName), FStringFormatArg(Value)});
Result.ErrorMessage = ErrorMessage; Result.ErrorMessage = ErrorMessage;
return Result; return Result;
@@ -72,18 +72,24 @@ FString cmdlineparser::details::EnsureEndsWith(const FString& Token, const TCHAR
return Token.EndsWith(Suffix) ? Token : Token + Suffix; 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 (int32 CliPort; FParse::Value(*CommandLine, *EnsureEndsWith(Token, TEXT("=")), CliPort))
{ {
if (CliPort >= details::MIN_PORT && CliPort <= details::MAX_PORT) 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) bool cmdlineparser::details::DoesRegExMatch(const FString& Text, const FString& Pattern)

2
Source/FPSTemplate/Private/GameLiftClpTypes.cpp
View File

@@ -14,6 +14,7 @@ const TArray<FString>& cmdlineparser::details::ERROR_MESSAGES = []() -> const TA
const TArray<FString>& cmdlineparser::details::CLI_TOKENS = []() -> const TArray<FString>& const TArray<FString>& cmdlineparser::details::CLI_TOKENS = []() -> const TArray<FString>&
{ {
static TArray<FString> Cli_Tokens; static TArray<FString> Cli_Tokens;
Cli_Tokens.Add(TEXT("unknown")); // Unknown = 0;
Cli_Tokens.Add(TEXT("authtoken")); Cli_Tokens.Add(TEXT("authtoken"));
Cli_Tokens.Add(TEXT("hostid")); Cli_Tokens.Add(TEXT("hostid"));
Cli_Tokens.Add(TEXT("fleetid")); 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>& const TArray<FString>& cmdlineparser::details::REGEX_PATTERNS = []() -> const TArray<FString>&
{ {
static TArray<FString> Cli_Tokens; 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\\-]+$"));
Cli_Tokens.Add(TEXT("^[a-zA-Z0-9][a-zA-Z0-9\\-]{0,62}[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\\-]+$")); Cli_Tokens.Add(TEXT("^[a-z]*fleet-[a-zA-Z0-9\\-]+$|^arn:.*:[a-z]*fleet\\/[a-z]*fleet-[a-zA-Z0-9\\-]+$"));

1
Source/FPSTemplate/Public/Game/ShooterGameMode.h
View File

@@ -53,5 +53,4 @@ private:
static FString GetValueOrHash(const FString& Value); static FString GetValueOrHash(const FString& Value);
TSharedPtr<FProcessParameters> ProcessParameters; TSharedPtr<FProcessParameters> ProcessParameters;
// TSharedPtr<FServerParameters> ServerParameters;
}; };

14
Source/FPSTemplate/Public/GameLift/GameLiftClp.h
View File

@@ -2,11 +2,17 @@
#include "GameLiftClpTypes.h" #include "GameLiftClpTypes.h"
#include "CoreMinimal.h" #include "CoreMinimal.h"
struct FPortResult
{
int32 Port;
bool bUsedDefaultPort;
FString WarningMessage;
};
namespace cmdlineparser namespace cmdlineparser
{ {
// int32 GetConfiguredOrDefaultPort(); FPortResult GetConfiguredOrDefaultPort(const FString& Token = TEXT("port="));
int32 GetConfiguredOrDefaultPort(const FString& Token = TEXT("port=")); FPortResult GetConfiguredOrDefaultPort(const FString& CommandLine, const FString& Token = TEXT("port="));
int32 GetConfiguredOrDefaultPort(const FString& CommandLine, const FString& Token = TEXT("port="));
details::FParseResult GetValueOfToken(const FString& CommandLine, const details::EAvailableTokens Token); details::FParseResult GetValueOfToken(const FString& CommandLine, const details::EAvailableTokens Token);
} }
@@ -18,7 +24,7 @@ namespace cmdlineparser::details
inline static constexpr const TCHAR* DEFAULT_PORT_TOKEN = TEXT("port="); inline static constexpr const TCHAR* DEFAULT_PORT_TOKEN = TEXT("port=");
FString EnsureEndsWith(const FString& Token, const TCHAR* Suffix); FString EnsureEndsWith(const FString& Token, const TCHAR* Suffix);
int32 GetConfiguredOrDefaultPort(const FString& CommandLine, const FString& Token); FPortResult GetConfiguredOrDefaultPort(const FString& CommandLine, const FString& Token);
bool DoesRegExMatch(const FString& Text, const FString& Pattern); bool DoesRegExMatch(const FString& Text, const FString& Pattern);
} }

11
Source/FPSTemplate/Public/GameLiftClpTypes.h
View File

@@ -4,6 +4,7 @@ namespace cmdlineparser::details
{ {
enum EAvailableTokens enum EAvailableTokens
{ {
Unknown = 0,
AuthToken, AuthToken,
HostId, HostId,
FleetId, FleetId,
@@ -26,11 +27,11 @@ namespace cmdlineparser::details
struct FParseResult struct FParseResult
{ {
EAvailableTokens Token; EAvailableTokens Token = EAvailableTokens::Unknown;
FString Value; FString Value = FString();
bool bIsValid; bool bIsValid = false;
EErrorCodes ErrorCode; EErrorCodes ErrorCode = EErrorCodes::TokenNotFound;
FString ErrorMessage; FString ErrorMessage = FString();
}; };
} }