@@ -42,7 +42,7 @@ void Message(const char *msg, ...)
42
42
char buf[1024 ] = {};
43
43
V_vsnprintf (buf, sizeof (buf) - 1 , msg, args);
44
44
45
- LoggingSystem_Log ( 20 , LS_MESSAGE, Color (0 , 255 , 200 ), " [MultiAddonManager] %s" , buf);
45
+ ConColorMsg ( Color (0 , 255 , 200 ), " [MultiAddonManager] %s" , buf);
46
46
47
47
va_end (args);
48
48
}
@@ -55,7 +55,7 @@ void Panic(const char *msg, ...)
55
55
char buf[1024 ] = {};
56
56
V_vsnprintf (buf, sizeof (buf) - 1 , msg, args);
57
57
58
- LoggingSystem_Log ( 20 , LS_WARNING, Color ( 255 , 255 , 0 ), " [MultiAddonManager] %s" , buf);
58
+ Warning ( " [MultiAddonManager] %s" , buf);
59
59
60
60
va_end (args);
61
61
}
@@ -214,13 +214,13 @@ bool MultiAddonManager::MountAddon(const char *pszAddon, bool bAddToTail = false
214
214
215
215
if (!g_pFullFileSystem->FileExists (path))
216
216
{
217
- Panic (__FUNCTION__ " : Addon %s not found at %s\n " , pszAddon, path);
217
+ Panic (" %s : Addon %s not found at %s\n " , __func__ , pszAddon, path);
218
218
return false ;
219
219
}
220
220
221
221
if (g_vecMountedAddons.Find (pszAddon) != -1 )
222
222
{
223
- Panic (__FUNCTION__ " : Addon %s is already mounted\n " , pszAddon);
223
+ Panic (" %s : Addon %s is already mounted\n " , __func__ , pszAddon);
224
224
return false ;
225
225
}
226
226
@@ -254,15 +254,15 @@ void MultiAddonManager::DownloadAddon(const char *pszAddon, bool bForce = false)
254
254
{
255
255
if (!g_SteamAPI.SteamUGC ())
256
256
{
257
- Panic (__FUNCTION__ " : Cannot download addons as the Steam API is not initialized\n " );
257
+ Panic (" %s : Cannot download addons as the Steam API is not initialized\n " , __func__ );
258
258
return ;
259
259
}
260
260
261
261
PublishedFileId_t addon = V_StringToUint64 (pszAddon, 0 );
262
262
263
263
if (addon == 0 )
264
264
{
265
- Panic (__FUNCTION__ " : Invalid addon %s\n " , pszAddon);
265
+ Panic (" %s : Invalid addon %s\n " , __func__ , pszAddon);
266
266
return ;
267
267
}
268
268
@@ -276,7 +276,7 @@ void MultiAddonManager::DownloadAddon(const char *pszAddon, bool bForce = false)
276
276
277
277
if (!g_SteamAPI.SteamUGC ()->DownloadItem (addon, true ))
278
278
{
279
- Panic (__FUNCTION__ " : Addon download for %lli failed to start, addon ID is invalid or server is not logged on Steam\n " , addon);
279
+ Panic (" %s : Addon download for %lli failed to start, addon ID is invalid or server is not logged on Steam\n " , __func__ , addon);
280
280
return ;
281
281
}
282
282
@@ -316,7 +316,7 @@ void MultiAddonManager::OnAddonDownloaded(DownloadItemResult_t *pResult)
316
316
{
317
317
if (pResult->m_eResult != k_EResultOK)
318
318
{
319
- Panic (__FUNCTION__ " : Addon %lli download failed with status %i\n " , pResult->m_nPublishedFileId , pResult->m_eResult );
319
+ Panic (" %s : Addon %lli download failed with status %i\n " , __func__ , pResult->m_nPublishedFileId , pResult->m_eResult );
320
320
return ;
321
321
}
322
322
@@ -459,7 +459,7 @@ ClientJoinInfo_t *GetPendingClient(INetChannel *pNetChan)
459
459
460
460
void MultiAddonManager::Hook_StartupServer (const GameSessionConfiguration_t &config, ISource2WorldSession *, const char *)
461
461
{
462
- Message (__FUNCTION__ " : %s\n " , g_pEngineServer->GetServerGlobals ()->mapname );
462
+ Message (" %s : %s\n " , __func__ , g_pEngineServer->GetServerGlobals ()->mapname );
463
463
464
464
g_pNetworkGameServer = g_pNetworkServerService->GetIGameServer ();
465
465
g_ClientsPendingAddon.RemoveAll ();
@@ -486,7 +486,7 @@ void FASTCALL Hook_SendNetMessage(INetChannel *pNetChan, INetworkSerializable *p
486
486
487
487
if (pPendingClient)
488
488
{
489
- Message (__FUNCTION__ " : Sending addon %s to client %lli\n " , g_vecExtraAddons[pPendingClient->addon ].c_str (), pPendingClient->steamid );
489
+ Message (" %s : Sending addon %s to client %lli\n " , __func__ , g_vecExtraAddons[pPendingClient->addon ].c_str (), pPendingClient->steamid );
490
490
491
491
CNETMsg_SignonState *pMsg = (CNETMsg_SignonState *)pData;
492
492
pMsg->set_addons (g_vecExtraAddons[pPendingClient->addon ]);
@@ -506,7 +506,7 @@ void* FASTCALL Hook_HostStateRequest(void *a1, void **pRequest)
506
506
// This offset hasn't changed in 6 years so it should be safe
507
507
CUtlString *sAddonString = (CUtlString *)(pRequest + 11 );
508
508
509
- Message (__FUNCTION__ " : appending \" %s\" to addon string \" %s\"\n " , g_sExtraAddons.c_str (), sAddonString ->Get ());
509
+ Message (" %s : appending \" %s\" to addon string \" %s\"\n " , __func__ , g_sExtraAddons.c_str (), sAddonString ->Get ());
510
510
511
511
// addons are simply comma-delimited, can have any number of them
512
512
if (!sAddonString ->IsEmpty ())
0 commit comments