Khaganat-NeL/khanat-opennel-code
2
0
Fork 0
Code Issues 21 Pull requests Projects Releases 1 Packages Wiki Activity

Changed: Log Steam warnings and messages

Browse source 
--HG--
branch : compatibility-develop
This commit is contained in:
kervala 2016-02-13 23:46:50 +01:00
parent b873aae389
commit b4b2721369
1 changed files with 33 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
code/ryzom/client/src/steam_client.cpp
View file

@ -26,26 +26,28 @@
// prototypes definitions for Steam API functions we'll call // prototypes definitions for Steam API functions we'll call
typedef bool (__cdecl *SteamAPI_InitFuncPtr)(); typedef bool (__cdecl *SteamAPI_InitFuncPtr)();
typedef void (__cdecl *SteamAPI_RegisterCallbackFuncPtr)(class CCallbackBase *pCallback, int iCallback);
typedef void (__cdecl *SteamAPI_RunCallbacksFuncPtr)();
typedef void (__cdecl *SteamAPI_ShutdownFuncPtr)(); typedef void (__cdecl *SteamAPI_ShutdownFuncPtr)();
typedef void (__cdecl *SteamAPI_UnregisterCallbackFuncPtr)(class CCallbackBase *pCallback); typedef ISteamClient* (__cdecl *SteamClientFuncPtr)();
typedef ISteamUtils* (__cdecl *SteamUtilsFuncPtr)();
typedef ISteamUser* (__cdecl *SteamUserFuncPtr)();
typedef ISteamFriends* (__cdecl *SteamFriendsFuncPtr)(); typedef ISteamFriends* (__cdecl *SteamFriendsFuncPtr)();
typedef ISteamUser* (__cdecl *SteamUserFuncPtr)();
typedef ISteamUtils* (__cdecl *SteamUtilsFuncPtr)();
typedef void (__cdecl *SteamAPI_RegisterCallbackFuncPtr)(class CCallbackBase *pCallback, int iCallback);
typedef void (__cdecl *SteamAPI_UnregisterCallbackFuncPtr)(class CCallbackBase *pCallback);
typedef void (__cdecl *SteamAPI_RunCallbacksFuncPtr)();
// macros to simplify dynamic functions loading // macros to simplify dynamic functions loading
#define NL_DECLARE_SYMBOL(symbol) symbol##FuncPtr nl##symbol = NULL #define NL_DECLARE_SYMBOL(symbol) symbol##FuncPtr nl##symbol = NULL
#define NL_LOAD_SYMBOL(symbol) nl##symbol = (symbol##FuncPtr)NLMISC::nlGetSymbolAddress(_Handle, #symbol) #define NL_LOAD_SYMBOL(symbol) nl##symbol = (symbol##FuncPtr)NLMISC::nlGetSymbolAddress(_Handle, #symbol)
NL_DECLARE_SYMBOL(SteamAPI_Init); NL_DECLARE_SYMBOL(SteamAPI_Init);
NL_DECLARE_SYMBOL(SteamAPI_Shutdown);
NL_DECLARE_SYMBOL(SteamClient);
NL_DECLARE_SYMBOL(SteamFriends); NL_DECLARE_SYMBOL(SteamFriends);
NL_DECLARE_SYMBOL(SteamUser); NL_DECLARE_SYMBOL(SteamUser);
NL_DECLARE_SYMBOL(SteamUtils); NL_DECLARE_SYMBOL(SteamUtils);
NL_DECLARE_SYMBOL(SteamAPI_RegisterCallback); NL_DECLARE_SYMBOL(SteamAPI_RegisterCallback);
NL_DECLARE_SYMBOL(SteamAPI_UnregisterCallback); NL_DECLARE_SYMBOL(SteamAPI_UnregisterCallback);
NL_DECLARE_SYMBOL(SteamAPI_RunCallbacks); NL_DECLARE_SYMBOL(SteamAPI_RunCallbacks);
NL_DECLARE_SYMBOL(SteamAPI_Shutdown);
// taken from steam_api.h, we needed to change it to use our dynamically loaded functions // taken from steam_api.h, we needed to change it to use our dynamically loaded functions
@ -260,6 +262,24 @@ CSteamClient::~CSteamClient()
release(); release();
} }
static void SteamWarningMessageHook(int severity, const char *message)
{
switch(severity)
{
case 1: // warning
nlwarning("%s", message);
break;
case 0: // message
nlinfo("%s", message);
break;
default: // unknown
nlwarning("Unknown severity %d: %s", severity, message);
break;
}
}
bool CSteamClient::init() bool CSteamClient::init()
{ {
std::string filename; std::string filename;
@ -283,7 +303,9 @@ bool CSteamClient::init()
return false; return false;
} }
// load Steam functions
NL_LOAD_SYMBOL(SteamAPI_Init); NL_LOAD_SYMBOL(SteamAPI_Init);
NL_LOAD_SYMBOL(SteamAPI_Shutdown);
// check if function was found // check if function was found
if (!nlSteamAPI_Init) if (!nlSteamAPI_Init)
@ -301,11 +323,14 @@ bool CSteamClient::init()
_Initialized = true; _Initialized = true;
// load more functions // load more Steam functions
NL_LOAD_SYMBOL(SteamClient);
NL_LOAD_SYMBOL(SteamFriends); NL_LOAD_SYMBOL(SteamFriends);
NL_LOAD_SYMBOL(SteamUser); NL_LOAD_SYMBOL(SteamUser);
NL_LOAD_SYMBOL(SteamUtils); NL_LOAD_SYMBOL(SteamUtils);
NL_LOAD_SYMBOL(SteamAPI_Shutdown);
// set warning messages hook
nlSteamClient()->SetWarningMessageHook(SteamWarningMessageHook);
bool loggedOn = nlSteamUser()->BLoggedOn(); bool loggedOn = nlSteamUser()->BLoggedOn();