Skip to content

Commit

Permalink
Allow SteamID to be used directly without .Value
Browse files Browse the repository at this point in the history 
get rid of a ton of .Value in methods
  • Loading branch information
@trdwll
trdwll committed Dec 10, 2020
1 parent 80a65c6 commit 21b7b75
Show file tree
Hide file tree
Showing 15 changed files with 243 additions and 147 deletions.
18 changes: 9 additions & 9 deletions Source/SteamBridge/Private/Core/SteamFriends.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ void USteamFriends::ActivateGameOverlay(const ESteamGameOverlayTypes OverlayType
void USteamFriends::ActivateGameOverlayToUser(const ESteamGameUserOverlayTypes OverlayType, FSteamID SteamID)
{
const FString Str = USteamBridgeUtils::GetEnumValueAsStringParsed(USteamBridgeUtils::GetEnumValueAsString<ESteamGameUserOverlayTypes>("ESteamGameUserOverlayTypes", OverlayType));
SteamFriends()->ActivateGameOverlayToUser(TCHAR_TO_ANSI(*Str), SteamID.Value);
SteamFriends()->ActivateGameOverlayToUser(TCHAR_TO_ANSI(*Str), SteamID);
}

FSteamAPICall USteamFriends::DownloadClanActivityCounts(TArray<FSteamID>& SteamClanIDs, int32 ClansToRequest) const
Expand All @@ -80,7 +80,7 @@ int32 USteamFriends::GetClanChatMessage(FSteamID SteamIDClanChat, int32 MessageI
TArray<char> TmpMessage;
TmpMessage.SetNum(MAX_int32);
CSteamID TmpSteamID;
int32 res = SteamFriends()->GetClanChatMessage(SteamIDClanChat.Value, MessageID, TmpMessage.GetData(), MAX_int32, &TmpEntryType, &TmpSteamID);
int32 res = SteamFriends()->GetClanChatMessage(SteamIDClanChat, MessageID, TmpMessage.GetData(), MAX_int32, &TmpEntryType, &TmpSteamID);
if (res < 0)
{
return -1;
Expand Down Expand Up @@ -126,7 +126,7 @@ int32 USteamFriends::GetFriendCount(const TArray<ESteamFriendFlags>& FriendFlags
bool USteamFriends::GetFriendGamePlayed(FSteamID SteamIDFriend, FSteamID& GameID, FString& GameIP, int32& GamePort, int32& QueryPort, FSteamID& SteamIDLobby)
{
FriendGameInfo_t InGameInfoStruct;
bool bResult = SteamFriends()->GetFriendGamePlayed(SteamIDFriend.Value, &InGameInfoStruct);
bool bResult = SteamFriends()->GetFriendGamePlayed(SteamIDFriend, &InGameInfoStruct);
GameID = InGameInfoStruct.m_gameID.ToUint64();
GameIP = USteamBridgeUtils::ConvertIPToString(InGameInfoStruct.m_unGameIP);
GamePort = InGameInfoStruct.m_usGamePort;
Expand All @@ -140,7 +140,7 @@ int32 USteamFriends::GetFriendMessage(FSteamID SteamIDFriend, int32 MessageIndex
EChatEntryType TmpEntryType;
TArray<char> TmpMessage;
TmpMessage.SetNum(MAX_int32);
int32 res = SteamFriends()->GetFriendMessage(SteamIDFriend.Value, MessageIndex, TmpMessage.GetData(), MAX_int32, &TmpEntryType);
int32 res = SteamFriends()->GetFriendMessage(SteamIDFriend, MessageIndex, TmpMessage.GetData(), MAX_int32, &TmpEntryType);
if (res < 0)
{
return 0;
Expand All @@ -160,7 +160,7 @@ void USteamFriends::GetFriendsGroupMembersList(FSteamFriendsGroupID FriendsGroup
}

TArray<CSteamID> TmpArray;
SteamFriends()->GetFriendsGroupMembersList(FriendsGroupID.Value, TmpArray.GetData(), count);
SteamFriends()->GetFriendsGroupMembersList(FriendsGroupID, TmpArray.GetData(), count);
for (int32 i = 0; i < count; i++)
{
MemberSteamIDs.Add(TmpArray[i].ConvertToUint64());
Expand All @@ -173,13 +173,13 @@ UTexture2D* USteamFriends::GetFriendAvatar(FSteamID SteamIDFriend, ESteamAvatarS
switch (AvatarSize)
{
case ESteamAvatarSize::Small:
Avatar = SteamFriends()->GetSmallFriendAvatar(SteamIDFriend.Value);
Avatar = SteamFriends()->GetSmallFriendAvatar(SteamIDFriend);
break;
case ESteamAvatarSize::Medium:
Avatar = SteamFriends()->GetMediumFriendAvatar(SteamIDFriend.Value);
Avatar = SteamFriends()->GetMediumFriendAvatar(SteamIDFriend);
break;
case ESteamAvatarSize::Large:
Avatar = SteamFriends()->GetLargeFriendAvatar(SteamIDFriend.Value);
Avatar = SteamFriends()->GetLargeFriendAvatar(SteamIDFriend);
break;
}

Expand Down Expand Up @@ -236,7 +236,7 @@ bool USteamFriends::HasFriend(FSteamID SteamIDFriend, const TArray<ESteamFriendF
}
}

return SteamFriends()->HasFriend(SteamIDFriend.Value, flags);
return SteamFriends()->HasFriend(SteamIDFriend, flags);
}

void USteamFriends::OnAvatarImageLoaded(AvatarImageLoaded_t* pParam)
Expand Down
2 changes: 1 addition & 1 deletion Source/SteamBridge/Private/Core/SteamGameServer.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ USteamGameServer::~USteamGameServer()
ESteamBeginAuthSessionResult USteamGameServer::BeginAuthSession(TArray<uint8> AuthTicket, FSteamID SteamID)
{
AuthTicket.SetNum(8192);
return (ESteamBeginAuthSessionResult)SteamGameServer()->BeginAuthSession(AuthTicket.GetData(), 8192, SteamID.Value);
return (ESteamBeginAuthSessionResult)SteamGameServer()->BeginAuthSession(AuthTicket.GetData(), 8192, SteamID);
}

FHAuthTicket USteamGameServer::GetAuthSessionTicket(TArray<uint8> &AuthTicket)
Expand Down
2 changes: 1 addition & 1 deletion Source/SteamBridge/Private/Core/SteamGameServerStats.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ USteamGameServerStats::~USteamGameServerStats()

bool USteamGameServerStats::UpdateUserAvgRateStat(FSteamID SteamIDUser, const FString& Name, float CountThisSession, float SessionLength) const
{
return SteamGameServerStats()->UpdateUserAvgRateStat(SteamIDUser.Value, TCHAR_TO_UTF8(*Name), CountThisSession, SessionLength);
return SteamGameServerStats()->UpdateUserAvgRateStat(SteamIDUser, TCHAR_TO_UTF8(*Name), CountThisSession, SessionLength);
}

void USteamGameServerStats::OnGSStatsReceived(GSStatsReceived_t *pParam)
Expand Down
14 changes: 7 additions & 7 deletions Source/SteamBridge/Private/Core/SteamInput.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ USteamInput::~USteamInput()
int32 USteamInput::GetActiveActionSetLayers(FInputHandle InputHandle, TArray<FInputHandle>& Handles)
{
TArray<uint64> Tmp;
int32 result = SteamInput()->GetActiveActionSetLayers(InputHandle.Value, Tmp.GetData());
int32 result = SteamInput()->GetActiveActionSetLayers(InputHandle, Tmp.GetData());

for (int32 i = 0; i < result; i++)
{
Expand All @@ -29,7 +29,7 @@ int32 USteamInput::GetActiveActionSetLayers(FInputHandle InputHandle, TArray<FIn

FSteamInputAnalogActionData USteamInput::GetAnalogActionData(FInputHandle InputHandle, FInputActionSetHandle ActionSetLayerHandle) const
{
InputAnalogActionData_t data = SteamInput()->GetAnalogActionData(InputHandle.Value, ActionSetLayerHandle.Value);
InputAnalogActionData_t data = SteamInput()->GetAnalogActionData(InputHandle, ActionSetLayerHandle);
return {(ESteamControllerSourceMode)data.eMode, data.x, data.y, data.bActive};
}

Expand Down Expand Up @@ -61,14 +61,14 @@ int32 USteamInput::GetConnectedControllers(TArray<FInputHandle>& Handles)

FSteamInputDigitalActionData USteamInput::GetDigitalActionData(FInputHandle InputHandle, FInputDigitalActionHandle DigitalActionHandle) const
{
InputDigitalActionData_t data = SteamInput()->GetDigitalActionData(InputHandle.Value, DigitalActionHandle);
InputDigitalActionData_t data = SteamInput()->GetDigitalActionData(InputHandle, DigitalActionHandle);
return {data.bState, data.bActive};
}

int32 USteamInput::GetDigitalActionOrigins(FInputHandle InputHandle, FInputActionSetHandle ActionSetHandle, FInputDigitalActionHandle DigitalActionHandle, TArray<ESteamInputActionOrigin>& Origins)
{
TArray<EInputActionOrigin> Tmp;
int32 result = SteamInput()->GetDigitalActionOrigins(InputHandle.Value, ActionSetHandle.Value, DigitalActionHandle, Tmp.GetData());
int32 result = SteamInput()->GetDigitalActionOrigins(InputHandle, ActionSetHandle, DigitalActionHandle, Tmp.GetData());

for (int32 i = 0; i < result; i++)
{
Expand All @@ -80,7 +80,7 @@ int32 USteamInput::GetDigitalActionOrigins(FInputHandle InputHandle, FInputActio

FSteamInputMotionData USteamInput::GetMotionData(FInputHandle InputHandle) const
{
InputMotionData_t data = SteamInput()->GetMotionData(InputHandle.Value);
InputMotionData_t data = SteamInput()->GetMotionData(InputHandle);
return {{data.rotQuatX, data.rotQuatY, data.rotQuatZ, data.rotQuatW}, {data.posAccelX, data.posAccelY, data.posAccelZ}, {data.rotVelX, data.rotVelY, data.rotVelZ}};
}

Expand All @@ -91,7 +91,7 @@ void USteamInput::SetLEDColorU(FInputHandle InputHandle, uint8 R, uint8 G, uint8
{
Tmp |= 1 << (uint8)Flags[i];
}
SteamInput()->SetLEDColor(InputHandle.Value, R, G, B, Tmp);
SteamInput()->SetLEDColor(InputHandle, R, G, B, Tmp);
}

void USteamInput::SetLEDColor(FInputHandle InputHandle, const FLinearColor& Color, const TArray<ESteamControllerLEDFlag_>& Flags)
Expand All @@ -101,5 +101,5 @@ void USteamInput::SetLEDColor(FInputHandle InputHandle, const FLinearColor& Colo
{
Tmp |= 1 << (uint8)Flags[i];
}
SteamInput()->SetLEDColor(InputHandle.Value, Color.R, Color.G, Color.B, Tmp);
SteamInput()->SetLEDColor(InputHandle, Color.R, Color.G, Color.B, Tmp);
}
10 changes: 5 additions & 5 deletions Source/SteamBridge/Private/Core/SteamInventory.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,11 +77,11 @@ bool USteamInventory::GenerateItems(FSteamInventoryResult& ResultHandle, const T
bool USteamInventory::GetEligiblePromoItemDefinitionIDs(FSteamID SteamID, TArray<FSteamItemDef>& Items) const
{
uint32 TmpCount = 0;
if (SteamInventory()->GetEligiblePromoItemDefinitionIDs(SteamID.Value, nullptr, &TmpCount))
if (SteamInventory()->GetEligiblePromoItemDefinitionIDs(SteamID, nullptr, &TmpCount))
{
TArray<SteamItemDef_t> TmpArray;
TmpArray.SetNum(TmpCount);
bool result = SteamInventory()->GetEligiblePromoItemDefinitionIDs(SteamID.Value, TmpArray.GetData(), &TmpCount);
bool result = SteamInventory()->GetEligiblePromoItemDefinitionIDs(SteamID, TmpArray.GetData(), &TmpCount);

for (int32 i = 0; i < (int32)TmpCount; i++)
{
Expand Down Expand Up @@ -117,7 +117,7 @@ bool USteamInventory::GetItemPrice(FSteamItemDef ItemDef, int64& CurrentPrice, i
uint64 TmpCurrent = 0, TmpBase = 0;
CurrentPrice = TmpCurrent;
BasePrice = TmpBase;
return SteamInventory()->GetItemPrice(ItemDef.Value, &TmpCurrent, &TmpBase);
return SteamInventory()->GetItemPrice(ItemDef, &TmpCurrent, &TmpBase);
}

bool USteamInventory::GetResultItemProperty(FSteamInventoryResult ResultHandle, int32 ItemIndex, const FString& PropertyName, FString& Value) const
Expand Down Expand Up @@ -153,10 +153,10 @@ bool USteamInventory::GetResultItems(FSteamInventoryResult ResultHandle, TArray<
bool USteamInventory::SerializeResult(FSteamInventoryResult ResultHandle, TArray<uint8>& Buffer) const
{
uint32 TmpCount = 0;
if (SteamInventory()->SerializeResult(ResultHandle.Value, nullptr, &TmpCount))
if (SteamInventory()->SerializeResult(ResultHandle, nullptr, &TmpCount))
{
Buffer.SetNum(TmpCount);
bool bResult = SteamInventory()->SerializeResult(ResultHandle.Value, Buffer.GetData(), &TmpCount);
bool bResult = SteamInventory()->SerializeResult(ResultHandle, Buffer.GetData(), &TmpCount);
return bResult;
}

Expand Down
12 changes: 6 additions & 6 deletions Source/SteamBridge/Private/Core/SteamMatchmaking.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,11 +75,11 @@ bool USteamMatchmaking::GetFavoriteGame(int32 GameIndex, int32& AppID, FString&
int32 USteamMatchmaking::GetLobbyChatEntry(FSteamID SteamIDLobby, int32 ChatID, FSteamID& SteamIDUser, FString& Message, ESteamChatEntryType& ChatEntryType) const
{
EChatEntryType TmpType;
CSteamID TmpUserSteamID = SteamIDUser.Value;
CSteamID TmpUserSteamID = SteamIDUser;
TArray<uint8> MessageBuffer;
MessageBuffer.SetNum(8192);

int32 Result = SteamMatchmaking()->GetLobbyChatEntry(SteamIDLobby.Value, ChatID, &TmpUserSteamID, MessageBuffer.GetData(), 8192, &TmpType);
int32 Result = SteamMatchmaking()->GetLobbyChatEntry(SteamIDLobby, ChatID, &TmpUserSteamID, MessageBuffer.GetData(), 8192, &TmpType);

SteamIDUser = TmpUserSteamID.ConvertToUint64();
ChatEntryType = (ESteamChatEntryType)TmpType;
Expand All @@ -97,7 +97,7 @@ bool USteamMatchmaking::GetLobbyDataByIndex(FSteamID SteamIDLobby, int32 LobbyDa
TmpKey.SetNum(8192);
TmpValue.SetNum(8192);

bool bResult = SteamMatchmaking()->GetLobbyDataByIndex(SteamIDLobby.Value, LobbyData, TmpKey.GetData(), 8192, TmpValue.GetData(), 8192);
bool bResult = SteamMatchmaking()->GetLobbyDataByIndex(SteamIDLobby, LobbyData, TmpKey.GetData(), 8192, TmpValue.GetData(), 8192);

Key = UTF8_TO_TCHAR(TmpKey.GetData());
Value = UTF8_TO_TCHAR(TmpValue.GetData());
Expand All @@ -111,7 +111,7 @@ bool USteamMatchmaking::GetLobbyGameServer(FSteamID SteamIDLobby, FString& GameS
uint16 TmpPort = 0;
CSteamID TmpSteamID;

bool bResult = SteamMatchmaking()->GetLobbyGameServer(SteamIDLobby.Value, &TmpIP, &TmpPort, &TmpSteamID);
bool bResult = SteamMatchmaking()->GetLobbyGameServer(SteamIDLobby, &TmpIP, &TmpPort, &TmpSteamID);

GameServerIP = USteamBridgeUtils::ConvertIPToString(TmpIP);
GameServerPort = TmpPort;
Expand Down Expand Up @@ -141,15 +141,15 @@ bool USteamMatchmaking::SendLobbyChatMsg(FSteamID SteamIDLobby, FString Message)
MemWriter << Message;
MemWriter.Close();

return SteamMatchmaking()->SendLobbyChatMsg(SteamIDLobby.Value, MessageBuffer.GetData(), MessageBuffer.Num());
return SteamMatchmaking()->SendLobbyChatMsg(SteamIDLobby, MessageBuffer.GetData(), MessageBuffer.Num());
}

void USteamMatchmaking::SetLobbyGameServer(FSteamID SteamIDLobby, const FString& GameServerIP, int32 GameServerPort, FSteamID SteamIDGameServer) const
{
uint32 TmpIP = 0;
USteamBridgeUtils::ConvertIPStringToUint32(GameServerIP, TmpIP);

SteamMatchmaking()->SetLobbyGameServer(SteamIDLobby.Value, TmpIP, GameServerPort, SteamIDGameServer.Value);
SteamMatchmaking()->SetLobbyGameServer(SteamIDLobby, TmpIP, GameServerPort, SteamIDGameServer);
}

void USteamMatchmaking::OnFavoritesListAccountsUpdated(FavoritesListAccountsUpdated_t* pParam)
Expand Down
2 changes: 1 addition & 1 deletion Source/SteamBridge/Private/Core/SteamUser.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ void USteamUser::AdvertiseGame(FSteamID SteamID, const FString& IP, int32 Port)
{
uint32 TmpIP;
USteamBridgeUtils::ConvertIPStringToUint32(IP, TmpIP);
SteamUser()->AdvertiseGame(SteamID.Value, TmpIP, FMath::Clamp<uint16>(Port, 0, 65535));
SteamUser()->AdvertiseGame(SteamID, TmpIP, FMath::Clamp<uint16>(Port, 0, 65535));
}

ESteamVoiceResult USteamUser::DecompressVoice(const TArray<uint8>& CompressedBuffer, TArray<uint8>& UncompressedBuffer)
Expand Down
Loading

0 comments on commit 21b7b75

Please sign in to comment.