missing declarations + use same #ifdef + remove inline timeline interface accessor

This commit is contained in:
otavepto 2024-07-01 08:36:19 +03:00
parent a78a27f21f
commit 6abb636309
12 changed files with 22 additions and 18 deletions

View File

@ -792,7 +792,7 @@ STEAMAPI_API SteamAPICall_t SteamAPI_ISteamFriends_RequestEquippedProfileItems(
return (get_steam_client()->steam_friends)->RequestEquippedProfileItems(steamID); return (get_steam_client()->steam_friends)->RequestEquippedProfileItems(steamID);
} }
STEAMAPI_API bool SteamAPI_ISteamFriends_BHasEquippedProfileItem( ISteamFriends* self, uint64_steamid steamID, ECommunityProfileItemType itemType ) STEAMAPI_API steam_bool SteamAPI_ISteamFriends_BHasEquippedProfileItem( ISteamFriends* self, uint64_steamid steamID, ECommunityProfileItemType itemType )
{ {
return (get_steam_client()->steam_friends)->BHasEquippedProfileItem(steamID, itemType); return (get_steam_client()->steam_friends)->BHasEquippedProfileItem(steamID, itemType);
} }

View File

@ -6,7 +6,7 @@
#ifndef ISTEAMGAMESTATS_H #ifndef ISTEAMGAMESTATS_H
#define ISTEAMGAMESTATS_H #define ISTEAMGAMESTATS_H
#ifdef _WIN32 #ifdef STEAM_WIN32
#pragma once #pragma once
#endif #endif

View File

@ -1,4 +1,4 @@
//====== Copyright © 1996-2008, Valve Corporation, All rights reserved. ======= //====== Copyright © 1996-2008, Valve Corporation, All rights reserved. =======
// //
// Purpose: interface to steam for retrieving list of game servers // Purpose: interface to steam for retrieving list of game servers
// //
@ -6,7 +6,7 @@
#ifndef ISTEAMMASTERSERVERUPDATER_H #ifndef ISTEAMMASTERSERVERUPDATER_H
#define ISTEAMMASTERSERVERUPDATER_H #define ISTEAMMASTERSERVERUPDATER_H
#ifdef _WIN32 #ifdef STEAM_WIN32
#pragma once #pragma once
#endif #endif

View File

@ -6,7 +6,7 @@
#ifndef ISTEAMSCREENSHOTS001_H #ifndef ISTEAMSCREENSHOTS001_H
#define ISTEAMSCREENSHOTS001_H #define ISTEAMSCREENSHOTS001_H
#ifdef _WIN32 #ifdef STEAM_WIN32
#pragma once #pragma once
#endif #endif

View File

@ -6,7 +6,7 @@
#ifndef ISTEAMSCREENSHOTS002_H #ifndef ISTEAMSCREENSHOTS002_H
#define ISTEAMSCREENSHOTS002_H #define ISTEAMSCREENSHOTS002_H
#ifdef _WIN32 #ifdef STEAM_WIN32
#pragma once #pragma once
#endif #endif

View File

@ -1,4 +1,4 @@
//====== Copyright <EFBFBD> Valve Corporation, All rights reserved. ======= //====== Copyright © Valve Corporation, All rights reserved. =======
// //
// Purpose: interface to Steam Timeline // Purpose: interface to Steam Timeline
// //
@ -6,7 +6,7 @@
#ifndef ISTEAMTIMELINE_H #ifndef ISTEAMTIMELINE_H
#define ISTEAMTIMELINE_H #define ISTEAMTIMELINE_H
#ifdef _WIN32 #ifdef STEAM_WIN32
#pragma once #pragma once
#endif #endif
@ -107,9 +107,11 @@ public:
#define STEAMTIMELINE_INTERFACE_VERSION "STEAMTIMELINE_INTERFACE_V001" #define STEAMTIMELINE_INTERFACE_VERSION "STEAMTIMELINE_INTERFACE_V001"
#ifndef STEAM_API_EXPORTS
// Global interface accessor // Global interface accessor
inline ISteamTimeline *SteamTimeline(); inline ISteamTimeline *SteamTimeline();
STEAM_DEFINE_USER_INTERFACE_ACCESSOR( ISteamTimeline *, SteamTimeline, STEAMTIMELINE_INTERFACE_VERSION ); STEAM_DEFINE_USER_INTERFACE_ACCESSOR( ISteamTimeline *, SteamTimeline, STEAMTIMELINE_INTERFACE_VERSION );
#endif
#pragma pack( pop ) #pragma pack( pop )

View File

@ -1,6 +1,6 @@
#ifndef ISTEAMVIDEO001_H #ifndef ISTEAMVIDEO001_H
#define ISTEAMVIDEO001_H #define ISTEAMVIDEO001_H
#ifdef _WIN32 #ifdef STEAM_WIN32
#pragma once #pragma once
#endif #endif

View File

@ -1,6 +1,6 @@
#ifndef ISTEAMVIDEO002_H #ifndef ISTEAMVIDEO002_H
#define ISTEAMVIDEO002_H #define ISTEAMVIDEO002_H
#ifdef _WIN32 #ifdef STEAM_WIN32
#pragma once #pragma once
#endif #endif

View File

@ -177,6 +177,7 @@
#include "isteaminventory.h" #include "isteaminventory.h"
#include "isteaminventory001.h" #include "isteaminventory001.h"
#include "isteaminventory002.h" #include "isteaminventory002.h"
#include "isteamtimeline.h"
#include "isteamvideo.h" #include "isteamvideo.h"
#include "isteamvideo001.h" #include "isteamvideo001.h"
#include "isteamvideo002.h" #include "isteamvideo002.h"

View File

@ -85,8 +85,8 @@ typedef char SteamErrMsg[ k_cchMaxSteamErrMsg ];
#endif #endif
#define __cdecl #define __cdecl
#endif #endif
extern "C" typedef void (__cdecl *SteamAPIWarningMessageHook_t)(int, const char *); extern "C" typedef void ( __cdecl *SteamAPIWarningMessageHook_t )( int, const char *);
extern "C" typedef uint32 ( *SteamAPI_CheckCallbackRegistered_t )( int iCallbackNum ); extern "C" typedef uint32 ( __cdecl *SteamAPI_CheckCallbackRegistered_t )( int iCallbackNum );
#if defined( __SNC__ ) #if defined( __SNC__ )
#pragma diag_suppress=1700 // warning 1700: class "%s" has virtual functions but non-virtual destructor #pragma diag_suppress=1700 // warning 1700: class "%s" has virtual functions but non-virtual destructor
#endif #endif

View File

@ -175,7 +175,7 @@ STEAMAPI_API void SteamAPI_ISteamFriends_ActivateGameOverlayRemotePlayTogetherIn
STEAMAPI_API steam_bool SteamAPI_ISteamFriends_RegisterProtocolInOverlayBrowser( ISteamFriends* self, const char * pchProtocol ); STEAMAPI_API steam_bool SteamAPI_ISteamFriends_RegisterProtocolInOverlayBrowser( ISteamFriends* self, const char * pchProtocol );
STEAMAPI_API void SteamAPI_ISteamFriends_ActivateGameOverlayInviteDialogConnectString( ISteamFriends* self, const char * pchConnectString ); STEAMAPI_API void SteamAPI_ISteamFriends_ActivateGameOverlayInviteDialogConnectString( ISteamFriends* self, const char * pchConnectString );
STEAMAPI_API SteamAPICall_t SteamAPI_ISteamFriends_RequestEquippedProfileItems( ISteamFriends* self, uint64_steamid steamID ); STEAMAPI_API SteamAPICall_t SteamAPI_ISteamFriends_RequestEquippedProfileItems( ISteamFriends* self, uint64_steamid steamID );
STEAMAPI_API bool SteamAPI_ISteamFriends_BHasEquippedProfileItem( ISteamFriends* self, uint64_steamid steamID, ECommunityProfileItemType itemType ); STEAMAPI_API steam_bool SteamAPI_ISteamFriends_BHasEquippedProfileItem( ISteamFriends* self, uint64_steamid steamID, ECommunityProfileItemType itemType );
STEAMAPI_API const char * SteamAPI_ISteamFriends_GetProfileItemPropertyString( ISteamFriends* self, uint64_steamid steamID, ECommunityProfileItemType itemType, ECommunityProfileItemProperty prop ); STEAMAPI_API const char * SteamAPI_ISteamFriends_GetProfileItemPropertyString( ISteamFriends* self, uint64_steamid steamID, ECommunityProfileItemType itemType, ECommunityProfileItemProperty prop );
STEAMAPI_API uint32 SteamAPI_ISteamFriends_GetProfileItemPropertyUint( ISteamFriends* self, uint64_steamid steamID, ECommunityProfileItemType itemType, ECommunityProfileItemProperty prop ); STEAMAPI_API uint32 SteamAPI_ISteamFriends_GetProfileItemPropertyUint( ISteamFriends* self, uint64_steamid steamID, ECommunityProfileItemType itemType, ECommunityProfileItemProperty prop );
@ -702,11 +702,13 @@ STEAMAPI_API ISteamUGC *SteamAPI_SteamUGC_v015();
STEAMAPI_API ISteamUGC *SteamAPI_SteamUGC_v016(); STEAMAPI_API ISteamUGC *SteamAPI_SteamUGC_v016();
STEAMAPI_API ISteamUGC *SteamAPI_SteamUGC_v017(); STEAMAPI_API ISteamUGC *SteamAPI_SteamUGC_v017();
STEAMAPI_API ISteamUGC *SteamAPI_SteamUGC_v018(); STEAMAPI_API ISteamUGC *SteamAPI_SteamUGC_v018();
STEAMAPI_API ISteamUGC *SteamAPI_SteamUGC_v020();
STEAMAPI_API ISteamUGC *SteamAPI_SteamGameServerUGC_v014(); STEAMAPI_API ISteamUGC *SteamAPI_SteamGameServerUGC_v014();
STEAMAPI_API ISteamUGC *SteamAPI_SteamGameServerUGC_v015(); STEAMAPI_API ISteamUGC *SteamAPI_SteamGameServerUGC_v015();
STEAMAPI_API ISteamUGC *SteamAPI_SteamGameServerUGC_v016(); STEAMAPI_API ISteamUGC *SteamAPI_SteamGameServerUGC_v016();
STEAMAPI_API ISteamUGC *SteamAPI_SteamGameServerUGC_v017(); STEAMAPI_API ISteamUGC *SteamAPI_SteamGameServerUGC_v017();
STEAMAPI_API ISteamUGC *SteamAPI_SteamGameServerUGC_v018(); STEAMAPI_API ISteamUGC *SteamAPI_SteamGameServerUGC_v018();
STEAMAPI_API ISteamUGC *SteamAPI_SteamGameServerUGC_v020();
STEAMAPI_API UGCQueryHandle_t SteamAPI_ISteamUGC_CreateQueryUserUGCRequest( ISteamUGC* self, AccountID_t unAccountID, EUserUGCList eListType, EUGCMatchingUGCType eMatchingUGCType, EUserUGCListSortOrder eSortOrder, AppId_t nCreatorAppID, AppId_t nConsumerAppID, uint32 unPage ); STEAMAPI_API UGCQueryHandle_t SteamAPI_ISteamUGC_CreateQueryUserUGCRequest( ISteamUGC* self, AccountID_t unAccountID, EUserUGCList eListType, EUGCMatchingUGCType eMatchingUGCType, EUserUGCListSortOrder eSortOrder, AppId_t nCreatorAppID, AppId_t nConsumerAppID, uint32 unPage );
STEAMAPI_API UGCQueryHandle_t SteamAPI_ISteamUGC_CreateQueryAllUGCRequestPage( ISteamUGC* self, EUGCQuery eQueryType, EUGCMatchingUGCType eMatchingeMatchingUGCTypeFileType, AppId_t nCreatorAppID, AppId_t nConsumerAppID, uint32 unPage ); STEAMAPI_API UGCQueryHandle_t SteamAPI_ISteamUGC_CreateQueryAllUGCRequestPage( ISteamUGC* self, EUGCQuery eQueryType, EUGCMatchingUGCType eMatchingeMatchingUGCTypeFileType, AppId_t nCreatorAppID, AppId_t nConsumerAppID, uint32 unPage );
STEAMAPI_API UGCQueryHandle_t SteamAPI_ISteamUGC_CreateQueryAllUGCRequestCursor( ISteamUGC* self, EUGCQuery eQueryType, EUGCMatchingUGCType eMatchingeMatchingUGCTypeFileType, AppId_t nCreatorAppID, AppId_t nConsumerAppID, const char * pchCursor ); STEAMAPI_API UGCQueryHandle_t SteamAPI_ISteamUGC_CreateQueryAllUGCRequestCursor( ISteamUGC* self, EUGCQuery eQueryType, EUGCMatchingUGCType eMatchingeMatchingUGCTypeFileType, AppId_t nCreatorAppID, AppId_t nConsumerAppID, const char * pchCursor );
@ -897,8 +899,6 @@ STEAMAPI_API steam_bool SteamAPI_ISteamInventory_InspectItem( ISteamInventory* s
// A versioned accessor is exported by the library // A versioned accessor is exported by the library
STEAMAPI_API ISteamTimeline *SteamAPI_SteamTimeline_v001(); STEAMAPI_API ISteamTimeline *SteamAPI_SteamTimeline_v001();
// Inline, unversioned accessor to get the current version. Essentially the same as SteamTimeline(), but using this ensures that you are using a matching library.
inline ISteamTimeline *SteamAPI_SteamTimeline() { return SteamAPI_SteamTimeline_v001(); }
STEAMAPI_API void SteamAPI_ISteamTimeline_SetTimelineStateDescription( ISteamTimeline* self, const char * pchDescription, float flTimeDelta ); STEAMAPI_API void SteamAPI_ISteamTimeline_SetTimelineStateDescription( ISteamTimeline* self, const char * pchDescription, float flTimeDelta );
STEAMAPI_API void SteamAPI_ISteamTimeline_ClearTimelineStateDescription( ISteamTimeline* self, float flTimeDelta ); STEAMAPI_API void SteamAPI_ISteamTimeline_ClearTimelineStateDescription( ISteamTimeline* self, float flTimeDelta );
STEAMAPI_API void SteamAPI_ISteamTimeline_AddTimelineEvent( ISteamTimeline* self, const char * pchIcon, const char * pchTitle, const char * pchDescription, uint32 unPriority, float flStartOffsetSeconds, float flDurationSeconds, ETimelineEventClipPriority ePossibleClip ); STEAMAPI_API void SteamAPI_ISteamTimeline_AddTimelineEvent( ISteamTimeline* self, const char * pchIcon, const char * pchTitle, const char * pchDescription, uint32 unPriority, float flStartOffsetSeconds, float flDurationSeconds, ETimelineEventClipPriority ePossibleClip );
@ -906,6 +906,7 @@ STEAMAPI_API void SteamAPI_ISteamTimeline_SetTimelineGameMode( ISteamTimeline* s
// ISteamVideo // ISteamVideo
STEAMAPI_API ISteamVideo *SteamAPI_SteamVideo_v001();
STEAMAPI_API ISteamVideo *SteamAPI_SteamVideo_v002(); STEAMAPI_API ISteamVideo *SteamAPI_SteamVideo_v002();
STEAMAPI_API ISteamVideo *SteamAPI_SteamVideo_v007(); STEAMAPI_API ISteamVideo *SteamAPI_SteamVideo_v007();
STEAMAPI_API void SteamAPI_ISteamVideo_GetVideoURL( ISteamVideo* self, AppId_t unVideoAppID ); STEAMAPI_API void SteamAPI_ISteamVideo_GetVideoURL( ISteamVideo* self, AppId_t unVideoAppID );
@ -1099,9 +1100,7 @@ STEAMAPI_API void SteamAPI_ISteamGameServer_SetGameTags( ISteamGameServer* self,
STEAMAPI_API void SteamAPI_ISteamGameServer_SetGameData( ISteamGameServer* self, const char * pchGameData ); STEAMAPI_API void SteamAPI_ISteamGameServer_SetGameData( ISteamGameServer* self, const char * pchGameData );
STEAMAPI_API void SteamAPI_ISteamGameServer_SetRegion( ISteamGameServer* self, const char * pszRegion ); STEAMAPI_API void SteamAPI_ISteamGameServer_SetRegion( ISteamGameServer* self, const char * pszRegion );
STEAMAPI_API steam_bool SteamAPI_ISteamGameServer_SendUserConnectAndAuthenticate( ISteamGameServer* self, uint32 unIPClient, const void * pvAuthBlob, uint32 cubAuthBlobSize, CSteamID * pSteamIDUser ); STEAMAPI_API steam_bool SteamAPI_ISteamGameServer_SendUserConnectAndAuthenticate( ISteamGameServer* self, uint32 unIPClient, const void * pvAuthBlob, uint32 cubAuthBlobSize, CSteamID * pSteamIDUser );
STEAMAPI_API uint64_steamid SteamAPI_ISteamGameServer_CreateUnauthenticatedUserConnection( ISteamGameServer* self );
STEAMAPI_API void SteamAPI_ISteamGameServer_SendUserDisconnect( ISteamGameServer* self, uint64_steamid steamIDUser ); STEAMAPI_API void SteamAPI_ISteamGameServer_SendUserDisconnect( ISteamGameServer* self, uint64_steamid steamIDUser );
STEAMAPI_API steam_bool SteamAPI_ISteamGameServer_BUpdateUserData( ISteamGameServer* self, uint64_steamid steamIDUser, const char * pchPlayerName, uint32 uScore );
STEAMAPI_API void SteamAPI_ISteamGameServer_SetAdvertiseServerActive( ISteamGameServer* self, bool bActive ); STEAMAPI_API void SteamAPI_ISteamGameServer_SetAdvertiseServerActive( ISteamGameServer* self, bool bActive );
STEAMAPI_API HAuthTicket SteamAPI_ISteamGameServer_GetAuthSessionTicket( ISteamGameServer* self, void * pTicket, int cbMaxTicket, uint32 * pcbTicket, const SteamNetworkingIdentity * pSnid ); STEAMAPI_API HAuthTicket SteamAPI_ISteamGameServer_GetAuthSessionTicket( ISteamGameServer* self, void * pTicket, int cbMaxTicket, uint32 * pcbTicket, const SteamNetworkingIdentity * pSnid );
STEAMAPI_API EBeginAuthSessionResult SteamAPI_ISteamGameServer_BeginAuthSession( ISteamGameServer* self, const void * pAuthTicket, int cbAuthTicket, uint64_steamid steamID ); STEAMAPI_API EBeginAuthSessionResult SteamAPI_ISteamGameServer_BeginAuthSession( ISteamGameServer* self, const void * pAuthTicket, int cbAuthTicket, uint64_steamid steamID );
@ -1120,7 +1119,9 @@ STEAMAPI_API void SteamAPI_ISteamGameServer_ForceHeartbeat( ISteamGameServer* se
STEAMAPI_API SteamAPICall_t SteamAPI_ISteamGameServer_AssociateWithClan( ISteamGameServer* self, uint64_steamid steamIDClan ); STEAMAPI_API SteamAPICall_t SteamAPI_ISteamGameServer_AssociateWithClan( ISteamGameServer* self, uint64_steamid steamIDClan );
STEAMAPI_API SteamAPICall_t SteamAPI_ISteamGameServer_ComputeNewPlayerCompatibility( ISteamGameServer* self, uint64_steamid steamIDNewPlayer ); STEAMAPI_API SteamAPICall_t SteamAPI_ISteamGameServer_ComputeNewPlayerCompatibility( ISteamGameServer* self, uint64_steamid steamIDNewPlayer );
STEAMAPI_API steam_bool SteamAPI_ISteamGameServer_SendUserConnectAndAuthenticate_DEPRECATED( ISteamGameServer* self, uint32 unIPClient, const void * pvAuthBlob, uint32 cubAuthBlobSize, CSteamID * pSteamIDUser ); STEAMAPI_API steam_bool SteamAPI_ISteamGameServer_SendUserConnectAndAuthenticate_DEPRECATED( ISteamGameServer* self, uint32 unIPClient, const void * pvAuthBlob, uint32 cubAuthBlobSize, CSteamID * pSteamIDUser );
STEAMAPI_API uint64_steamid SteamAPI_ISteamGameServer_CreateUnauthenticatedUserConnection( ISteamGameServer* self );
STEAMAPI_API void SteamAPI_ISteamGameServer_SendUserDisconnect_DEPRECATED( ISteamGameServer* self, uint64_steamid steamIDUser ); STEAMAPI_API void SteamAPI_ISteamGameServer_SendUserDisconnect_DEPRECATED( ISteamGameServer* self, uint64_steamid steamIDUser );
STEAMAPI_API steam_bool SteamAPI_ISteamGameServer_BUpdateUserData( ISteamGameServer* self, uint64_steamid steamIDUser, const char * pchPlayerName, uint32 uScore );
// ISteamGameServerStats // ISteamGameServerStats

View File

@ -7,7 +7,7 @@
#ifndef STEAMNETWORKINGSOCKETS #ifndef STEAMNETWORKINGSOCKETS
#define STEAMNETWORKINGSOCKETS #define STEAMNETWORKINGSOCKETS
#ifdef _WIN32 #ifdef STEAM_WIN32
#pragma once #pragma once
#endif #endif