UNLOZE/SM-SteamWorks
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #5 from VoiDeD/master

Browse Source 
Rename InitSafe detour to squash an MSVC warning about inconsistent dll linkage.
This commit is contained in:
KyleSanderson
2014-04-05 13:39:30 -06:00
parent 7479fc12e3 3c6fb17454
commit 045980847f
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Extension/swgsdetours.cpp
+3 -3
View File
@@ -34,9 +34,9 @@ DETOUR_DECL_STATIC0(SteamAPIShutdown, void)
DETOUR_STATIC_CALL(SteamAPIShutdown)(); /* We're not a monster. */ DETOUR_STATIC_CALL(SteamAPIShutdown)(); /* We're not a monster. */
} }
DETOUR_DECL_STATIC6(SteamGameServer_InitSafe, bool, uint32, unIP, uint16, usSteamPort, uint16, usGamePort, uint16, usQueryPort, EServerMode, eServerMode, const char *, pchVersionString) DETOUR_DECL_STATIC6(SteamGameServer_InitSafeDetour, bool, uint32, unIP, uint16, usSteamPort, uint16, usGamePort, uint16, usQueryPort, EServerMode, eServerMode, const char *, pchVersionString)
{ {
bool bRet = DETOUR_STATIC_CALL(SteamGameServer_InitSafe)(unIP, usSteamPort, usGamePort, usQueryPort, eServerMode, pchVersionString); /* Call to init game interfaces. */ bool bRet = DETOUR_STATIC_CALL(SteamGameServer_InitSafeDetour)(unIP, usSteamPort, usGamePort, usQueryPort, eServerMode, pchVersionString); /* Call to init game interfaces. */
if (g_SteamWorks.pSWGameServer != NULL && g_SteamWorks.pGSHooks != NULL) if (g_SteamWorks.pSWGameServer != NULL && g_SteamWorks.pGSHooks != NULL)
{ {
@@ -103,7 +103,7 @@ SteamWorksGSDetours::SteamWorksGSDetours()
if (pSteamSafeInitAddress != NULL) if (pSteamSafeInitAddress != NULL)
{ {
this->m_pSafeInitDetour = DETOUR_CREATE_STATIC_FIXED(SteamGameServer_InitSafe, pSteamSafeInitAddress); this->m_pSafeInitDetour = DETOUR_CREATE_STATIC_FIXED(SteamGameServer_InitSafeDetour, pSteamSafeInitAddress);
this->m_pSafeInitDetour->EnableDetour(); this->m_pSafeInitDetour->EnableDetour();
} }
else else