R5Reloaded/r5sdk
1
0
Fork 0
mirror of https://github.com/Mauler125/r5sdk.git synced 2025-02-09 19:15:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

Utilize 'DevMsg()' for uncertain builds only

Browse Source 
Only uncertain builds will contain DevMsg()/DevWarning() prints. For retail, Msg() and Warning() should be used instead.
This commit is contained in:
Kawe Mazidjatari 2023-08-21 19:12:29 +02:00
parent c3bc8345f7
commit 71b0781715
39 changed files with 293 additions and 258 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
r5dev/codecs/Miles/miles_impl.cpp
View File

@ -10,7 +10,7 @@
//-----------------------------------------------------------------------------
void AIL_LogFunc(int64_t nLogLevel, const char* pszMessage)
{
DevMsg(eDLL_T::AUDIO, "%s\n", pszMessage);
Msg(eDLL_T::AUDIO, "%s\n", pszMessage);
v_AIL_LogFunc(nLogLevel, pszMessage);
}
@ -26,21 +26,21 @@ bool Miles_Initialize()
pszLanguage = MILES_DEFAULT_LANGUAGE;
}
DevMsg(eDLL_T::AUDIO, "%s: initializing MSS with language: '%s'\n", __FUNCTION__, pszLanguage);
Msg(eDLL_T::AUDIO, "%s: initializing MSS with language: '%s'\n", __FUNCTION__, pszLanguage);
CFastTimer initTimer;
initTimer.Start();
bool bResult = v_Miles_Initialize();
initTimer.End();
DevMsg(eDLL_T::AUDIO, "%s: %s ('%f' seconds)\n", __FUNCTION__, bResult ? "success" : "failure", initTimer.GetDuration().GetSeconds());
Msg(eDLL_T::AUDIO, "%s: %s ('%f' seconds)\n", __FUNCTION__, bResult ? "success" : "failure", initTimer.GetDuration().GetSeconds());
return bResult;
}
void MilesQueueEventRun(Miles::Queue* queue, const char* eventName)
{
if(miles_debug->GetBool())
DevMsg(eDLL_T::AUDIO, "%s: running event: '%s'\n", __FUNCTION__, eventName);
Msg(eDLL_T::AUDIO, "%s: running event: '%s'\n", __FUNCTION__, eventName);
v_MilesQueueEventRun(queue, eventName);
}

188
r5dev/common/callback.cpp
View File

@ -262,7 +262,7 @@ void Detour_HotSwap_f(const CCommand& args)
if (!g_pServer->IsActive())
return; // Only execute if server is initialized and active.
DevMsg(eDLL_T::SERVER, "Executing NavMesh hot swap for level '%s'\n",
Msg(eDLL_T::SERVER, "Executing NavMesh hot swap for level '%s'\n",
g_ServerGlobalVariables->m_pszMapName);
CFastTimer timer;
@ -271,7 +271,7 @@ void Detour_HotSwap_f(const CCommand& args)
Detour_HotSwap();
timer.End();
DevMsg(eDLL_T::SERVER, "Hot swap took '%lf' seconds\n", timer.GetDuration().GetSeconds());
Msg(eDLL_T::SERVER, "Hot swap took '%lf' seconds\n", timer.GetDuration().GetSeconds());
}
#endif // !CLIENT_DLL
/*
@ -281,8 +281,8 @@ Pak_ListPaks_f
*/
void Pak_ListPaks_f(const CCommand& args)
{
DevMsg(eDLL_T::RTECH, "| id | name | status | asset count |\n");
DevMsg(eDLL_T::RTECH, "|------|----------------------------------------------------|--------------------------------------|-------------|\n");
Msg(eDLL_T::RTECH, "| id | name | status | asset count |\n");
Msg(eDLL_T::RTECH, "|------|----------------------------------------------------|--------------------------------------|-------------|\n");
uint32_t nTotalLoaded = 0;
@ -296,12 +296,12 @@ void Pak_ListPaks_f(const CCommand& args)
const char* szRpakStatus = g_pRTech->PakStatusToString(info.m_nStatus);
// todo: make status into a string from an array/vector
DevMsg(eDLL_T::RTECH, "| %04i | %-50s | %-36s | %11i |\n", info.m_nHandle, info.m_pszFileName, szRpakStatus, info.m_nAssetCount);
Msg(eDLL_T::RTECH, "| %04i | %-50s | %-36s | %11i |\n", info.m_nHandle, info.m_pszFileName, szRpakStatus, info.m_nAssetCount);
nTotalLoaded++;
}
DevMsg(eDLL_T::RTECH, "|------|----------------------------------------------------|--------------------------------------|-------------|\n");
DevMsg(eDLL_T::RTECH, "| %18i loaded paks. |\n", nTotalLoaded);
DevMsg(eDLL_T::RTECH, "|------|----------------------------------------------------|--------------------------------------|-------------|\n");
Msg(eDLL_T::RTECH, "|------|----------------------------------------------------|--------------------------------------|-------------|\n");
Msg(eDLL_T::RTECH, "| %18i loaded paks. |\n", nTotalLoaded);
Msg(eDLL_T::RTECH, "|------|----------------------------------------------------|--------------------------------------|-------------|\n");
}
/*
@ -311,8 +311,8 @@ Pak_ListTypes_f
*/
void Pak_ListTypes_f(const CCommand& args)
{
DevMsg(eDLL_T::RTECH, "| ext | description | version | header size | native size |\n");
DevMsg(eDLL_T::RTECH, "|------|---------------------------|---------|-------------|-------------|\n");
Msg(eDLL_T::RTECH, "| ext | description | version | header size | native size |\n");
Msg(eDLL_T::RTECH, "|------|---------------------------|---------|-------------|-------------|\n");
uint32_t nRegistered = 0;
@ -323,12 +323,12 @@ void Pak_ListTypes_f(const CCommand& args)
if (!type->m_szDescription)
continue;
DevMsg(eDLL_T::RTECH, "| %-4s | %-25s | %7i | %11i | %11i |\n", FourCCToString(type->m_nExtension).c_str(), type->m_szDescription, type->m_iVersion, type->m_iSubHeaderSize, type->m_iNativeClassSize);
Msg(eDLL_T::RTECH, "| %-4s | %-25s | %7i | %11i | %11i |\n", FourCCToString(type->m_nExtension).c_str(), type->m_szDescription, type->m_iVersion, type->m_iSubHeaderSize, type->m_iNativeClassSize);
nRegistered++;
}
DevMsg(eDLL_T::RTECH, "|------|---------------------------|---------|-------------|-------------|\n");
DevMsg(eDLL_T::RTECH, "| %18i registered types. |\n", nRegistered);
DevMsg(eDLL_T::RTECH, "|------|---------------------------|---------|-------------|-------------|\n");
Msg(eDLL_T::RTECH, "|------|---------------------------|---------|-------------|-------------|\n");
Msg(eDLL_T::RTECH, "| %18i registered types. |\n", nRegistered);
Msg(eDLL_T::RTECH, "|------|---------------------------|---------|-------------|-------------|\n");
}
/*
@ -355,7 +355,7 @@ void Pak_RequestUnload_f(const CCommand& args)
}
const string pakName = pakInfo->m_pszFileName;
!pakName.empty() ? DevMsg(eDLL_T::RTECH, "Requested pak unload for file '%s'\n", pakName.c_str()) : DevMsg(eDLL_T::RTECH, "Requested pak unload for handle '%d'\n", pakHandle);
!pakName.empty() ? Msg(eDLL_T::RTECH, "Requested pak unload for file '%s'\n", pakName.c_str()) : Msg(eDLL_T::RTECH, "Requested pak unload for handle '%d'\n", pakHandle);
g_pakLoadApi->UnloadPak(pakHandle);
}
else
@ -366,7 +366,7 @@ void Pak_RequestUnload_f(const CCommand& args)
throw std::exception("Found no pak entry for specified name.");
}
DevMsg(eDLL_T::RTECH, "Requested pak unload for file '%s'\n", args.Arg(1));
Msg(eDLL_T::RTECH, "Requested pak unload for file '%s'\n", args.Arg(1));
g_pakLoadApi->UnloadPak(pakInfo->m_nHandle);
}
}
@ -424,7 +424,7 @@ void Pak_Swap_f(const CCommand& args)
pakHandle = pakInfo->m_nHandle;
}
!pakName.empty() ? DevMsg(eDLL_T::RTECH, "Requested pak swap for file '%s'\n", pakName.c_str()) : DevMsg(eDLL_T::RTECH, "Requested pak swap for handle '%d'\n", pakHandle);
!pakName.empty() ? Msg(eDLL_T::RTECH, "Requested pak swap for file '%s'\n", pakName.c_str()) : Msg(eDLL_T::RTECH, "Requested pak swap for handle '%d'\n", pakHandle);
g_pakLoadApi->UnloadPak(pakHandle);
@ -454,9 +454,9 @@ void RTech_StringToGUID_f(const CCommand& args)
unsigned long long guid = g_pRTech->StringToGuid(args.Arg(1));
DevMsg(eDLL_T::RTECH, "______________________________________________________________\n");
DevMsg(eDLL_T::RTECH, "] RTECH_HASH ]------------------------------------------------\n");
DevMsg(eDLL_T::RTECH, "] GUID: '0x%llX'\n", guid);
Msg(eDLL_T::RTECH, "______________________________________________________________\n");
Msg(eDLL_T::RTECH, "] RTECH_HASH ]------------------------------------------------\n");
Msg(eDLL_T::RTECH, "] GUID: '0x%llX'\n", guid);
}
/*
@ -480,8 +480,8 @@ void RTech_Decompress_f(const CCommand& args)
inPakFile.Format(PLATFORM_PAK_PATH "%s", args.Arg(1));
outPakFile.Format(PLATFORM_PAK_OVERRIDE_PATH "%s", args.Arg(1));
DevMsg(eDLL_T::RTECH, "______________________________________________________________\n");
DevMsg(eDLL_T::RTECH, "-+ RTech decompress ------------------------------------------\n");
Msg(eDLL_T::RTECH, "______________________________________________________________\n");
Msg(eDLL_T::RTECH, "-+ RTech decompress ------------------------------------------\n");
if (!FileSystem()->FileExists(inPakFile.String(), "GAME"))
{
@ -490,7 +490,7 @@ void RTech_Decompress_f(const CCommand& args)
return;
}
DevMsg(eDLL_T::RTECH, " |-+ Processing: '%s'\n", inPakFile.String());
Msg(eDLL_T::RTECH, " |-+ Processing: '%s'\n", inPakFile.String());
FileHandle_t hPakFile = FileSystem()->Open(inPakFile.String(), "rb", "GAME");
if (!hPakFile)
@ -514,18 +514,18 @@ void RTech_Decompress_f(const CCommand& args)
SYSTEMTIME systemTime;
FileTimeToSystemTime(&pHeader->m_nFileTime, &systemTime);
DevMsg(eDLL_T::RTECH, " | |-+ Header ------------------------------------------------\n");
DevMsg(eDLL_T::RTECH, " | |-- Magic : '0x%08X'\n", pHeader->m_nMagic);
DevMsg(eDLL_T::RTECH, " | |-- Version : '%hu'\n", pHeader->m_nVersion);
DevMsg(eDLL_T::RTECH, " | |-- Flags : '0x%04hX'\n", flags);
DevMsg(eDLL_T::RTECH, " | |-- Time : '%hu-%hu-%hu/%hu %hu:%hu:%hu.%hu'\n",
Msg(eDLL_T::RTECH, " | |-+ Header ------------------------------------------------\n");
Msg(eDLL_T::RTECH, " | |-- Magic : '0x%08X'\n", pHeader->m_nMagic);
Msg(eDLL_T::RTECH, " | |-- Version : '%hu'\n", pHeader->m_nVersion);
Msg(eDLL_T::RTECH, " | |-- Flags : '0x%04hX'\n", flags);
Msg(eDLL_T::RTECH, " | |-- Time : '%hu-%hu-%hu/%hu %hu:%hu:%hu.%hu'\n",
systemTime.wYear,systemTime.wMonth,systemTime.wDay, systemTime.wDayOfWeek,
systemTime.wHour, systemTime.wMinute, systemTime.wSecond, systemTime.wMilliseconds);
DevMsg(eDLL_T::RTECH, " | |-- Hash : '0x%08llX'\n", pHeader->m_nHash);
DevMsg(eDLL_T::RTECH, " | |-- Entries : '%u'\n", pHeader->m_nAssetEntryCount);
DevMsg(eDLL_T::RTECH, " | |-+ Compression -----------------------------------------\n");
DevMsg(eDLL_T::RTECH, " | |-- Size comp: '%zu'\n", pHeader->m_nSizeDisk);
DevMsg(eDLL_T::RTECH, " | |-- Size decp: '%zu'\n", pHeader->m_nSizeMemory);
Msg(eDLL_T::RTECH, " | |-- Hash : '0x%08llX'\n", pHeader->m_nHash);
Msg(eDLL_T::RTECH, " | |-- Entries : '%u'\n", pHeader->m_nAssetEntryCount);
Msg(eDLL_T::RTECH, " | |-+ Compression -----------------------------------------\n");
Msg(eDLL_T::RTECH, " | |-- Size comp: '%zu'\n", pHeader->m_nSizeDisk);
Msg(eDLL_T::RTECH, " | |-- Size decp: '%zu'\n", pHeader->m_nSizeMemory);
if (pHeader->m_nMagic != PAK_HEADER_MAGIC)
{
@ -564,10 +564,10 @@ void RTech_Decompress_f(const CCommand& args)
}
else
{
DevMsg(eDLL_T::RTECH, " | |-- Size calc: '%llu'\n", nDecompSize);
Msg(eDLL_T::RTECH, " | |-- Size calc: '%llu'\n", nDecompSize);
}
DevMsg(eDLL_T::RTECH, " | |-- Ratio : '%.02f'\n", (pHeader->m_nSizeDisk * 100.f) / pHeader->m_nSizeMemory);
Msg(eDLL_T::RTECH, " | |-- Ratio : '%.02f'\n", (pHeader->m_nSizeDisk * 100.f) / pHeader->m_nSizeMemory);
std::unique_ptr<uint8_t[]> pDecompBufContainer(new uint8_t[nPakLen]);
@ -604,9 +604,9 @@ void RTech_Decompress_f(const CCommand& args)
i <= pHeader->m_nPatchIndex; i++, nPatchOffset += sizeof(RPakPatchCompressedHeader_t))
{
RPakPatchCompressedHeader_t* pPatchHeader = reinterpret_cast<RPakPatchCompressedHeader_t*>(pDecompBuf + nPatchOffset);
DevMsg(eDLL_T::RTECH, " | |-+ Patch #%02u -----------------------------------------\n", i);
DevMsg(eDLL_T::RTECH, " | %s |-- Size comp: '%llu'\n", i < pHeader->m_nPatchIndex ? "|" : " ", pPatchHeader->m_nSizeDisk);
DevMsg(eDLL_T::RTECH, " | %s |-- Size decp: '%llu'\n", i < pHeader->m_nPatchIndex ? "|" : " ", pPatchHeader->m_nSizeMemory);
Msg(eDLL_T::RTECH, " | |-+ Patch #%02u -----------------------------------------\n", i);
Msg(eDLL_T::RTECH, " | %s |-- Size comp: '%llu'\n", i < pHeader->m_nPatchIndex ? "|" : " ", pPatchHeader->m_nSizeDisk);
Msg(eDLL_T::RTECH, " | %s |-- Size decp: '%llu'\n", i < pHeader->m_nPatchIndex ? "|" : " ", pPatchHeader->m_nSizeMemory);
pPatchHeader->m_nSizeDisk = pPatchHeader->m_nSizeMemory; // Fix size for decompress.
}
@ -615,9 +615,9 @@ void RTech_Decompress_f(const CCommand& args)
memcpy_s(pDecompBuf, sizeof(RPakHeader_t), pPakBuf, sizeof(RPakHeader_t));// Overwrite first 0x80 bytes which are NULL with the header data.
FileSystem()->Write(pDecompBuf, decompState.m_nDecompSize, hDecompFile);
DevMsg(eDLL_T::RTECH, " |-- Checksum : '0x%08X'\n", crc32::update(NULL, pDecompBuf, decompState.m_nDecompSize));
DevMsg(eDLL_T::RTECH, "-+ Decompressed pak file to: '%s'\n", outPakFile.String());
DevMsg(eDLL_T::RTECH, "--------------------------------------------------------------\n");
Msg(eDLL_T::RTECH, " |-- Checksum : '0x%08X'\n", crc32::update(NULL, pDecompBuf, decompState.m_nDecompSize));
Msg(eDLL_T::RTECH, "-+ Decompressed pak file to: '%s'\n", outPakFile.String());
Msg(eDLL_T::RTECH, "--------------------------------------------------------------\n");
FileSystem()->Close(hDecompFile);
}
@ -640,15 +640,15 @@ void VPK_Pack_f(const CCommand& args)
VPKPair_t pair(args.Arg(1), args.Arg(2), args.Arg(3), NULL);
CFastTimer timer;
DevMsg(eDLL_T::FS, "*** Starting VPK build command for: '%s'\n", pair.m_DirName.Get());
Msg(eDLL_T::FS, "*** Starting VPK build command for: '%s'\n", pair.m_DirName.Get());
timer.Start();
g_pPackedStore->InitLzCompParams();
g_pPackedStore->PackWorkspace(pair, fs_packedstore_workspace->GetString(), "vpk/");
timer.End();
DevMsg(eDLL_T::FS, "*** Time elapsed: '%lf' seconds\n", timer.GetDuration().GetSeconds());
DevMsg(eDLL_T::FS, "\n");
Msg(eDLL_T::FS, "*** Time elapsed: '%lf' seconds\n", timer.GetDuration().GetSeconds());
Msg(eDLL_T::FS, "\n");
}
/*
@ -670,15 +670,15 @@ void VPK_Unpack_f(const CCommand& args)
VPKDir_t vpk(arg, (args.ArgC() > 2));
CFastTimer timer;
DevMsg(eDLL_T::FS, "*** Starting VPK extraction command for: '%s'\n", arg.Get());
Msg(eDLL_T::FS, "*** Starting VPK extraction command for: '%s'\n", arg.Get());
timer.Start();
g_pPackedStore->InitLzDecompParams();
g_pPackedStore->UnpackWorkspace(vpk, fs_packedstore_workspace->GetString());
timer.End();
DevMsg(eDLL_T::FS, "*** Time elapsed: '%lf' seconds\n", timer.GetDuration().GetSeconds());
DevMsg(eDLL_T::FS, "\n");
Msg(eDLL_T::FS, "*** Time elapsed: '%lf' seconds\n", timer.GetDuration().GetSeconds());
Msg(eDLL_T::FS, "\n");
}
/*
@ -787,7 +787,7 @@ void NET_UseSocketsForLoopbackChanged_f(IConVar* pConVar, const char* pOldString
// Reboot the RCON server to switch address type.
if (RCONServer()->IsInitialized())
{
DevMsg(eDLL_T::SERVER, "Rebooting RCON server...\n");
Msg(eDLL_T::SERVER, "Rebooting RCON server...\n");
RCONServer()->Shutdown();
RCONServer()->Init();
}
@ -819,21 +819,21 @@ CON_Help_f
*/
void CON_Help_f(const CCommand& args)
{
DevMsg(eDLL_T::COMMON, "Contexts:\n");
Msg(eDLL_T::COMMON, "Contexts:\n");
SQVM_PrintFunc(reinterpret_cast<HSQUIRRELVM>(SQCONTEXT::SERVER), (SQChar*)(" = Server DLL (Script)\n"));
SQVM_PrintFunc(reinterpret_cast<HSQUIRRELVM>(SQCONTEXT::CLIENT), (SQChar*)(" = Client DLL (Script)\n"));
SQVM_PrintFunc(reinterpret_cast<HSQUIRRELVM>(SQCONTEXT::UI), (SQChar*)(" = UI DLL (Script)\n"));
DevMsg(eDLL_T::SERVER, " = Server DLL (Code)\n");
DevMsg(eDLL_T::CLIENT, " = Client DLL (Code)\n");
DevMsg(eDLL_T::UI, " = UI DLL (Code)\n");
DevMsg(eDLL_T::ENGINE, " = Engine DLL (Code)\n");
DevMsg(eDLL_T::FS, " = FileSystem (Code)\n");
DevMsg(eDLL_T::RTECH, " = PakLoad API (Code)\n");
DevMsg(eDLL_T::MS, " = MaterialSystem (Code)\n");
DevMsg(eDLL_T::AUDIO, " = Audio DLL (Code)\n");
DevMsg(eDLL_T::VIDEO, " = Video DLL (Code)\n");
DevMsg(eDLL_T::NETCON, " = NetConsole (Code)\n");
Msg(eDLL_T::SERVER, " = Server DLL (Code)\n");
Msg(eDLL_T::CLIENT, " = Client DLL (Code)\n");
Msg(eDLL_T::UI, " = UI DLL (Code)\n");
Msg(eDLL_T::ENGINE, " = Engine DLL (Code)\n");
Msg(eDLL_T::FS, " = FileSystem (Code)\n");
Msg(eDLL_T::RTECH, " = PakLoad API (Code)\n");
Msg(eDLL_T::MS, " = MaterialSystem (Code)\n");
Msg(eDLL_T::AUDIO, " = Audio DLL (Code)\n");
Msg(eDLL_T::VIDEO, " = Video DLL (Code)\n");
Msg(eDLL_T::NETCON, " = NetConsole (Code)\n");
}
#ifndef DEDICATED
@ -850,7 +850,7 @@ void CON_LogHistory_f(const CCommand& args)
const vector<string> vHistory = g_pConsole->GetHistory();
for (size_t i = 0, nh = vHistory.size(); i < nh; i++)
{
DevMsg(eDLL_T::COMMON, "%3d: %s\n", i, vHistory[i].c_str());
Msg(eDLL_T::COMMON, "%3d: %s\n", i, vHistory[i].c_str());
}
}
@ -866,7 +866,7 @@ void CON_RemoveLine_f(const CCommand& args)
{
if (args.ArgC() < 3)
{
DevMsg(eDLL_T::CLIENT, "Usage 'con_removeline': start(int) end(int)\n");
Msg(eDLL_T::CLIENT, "Usage 'con_removeline': start(int) end(int)\n");
return;
}
@ -991,7 +991,7 @@ void RCON_Disconnect_f(const CCommand& args)
if (bIsConnected) // Log if client was indeed connected.
{
DevMsg(eDLL_T::CLIENT, "User closed RCON connection\n");
Msg(eDLL_T::CLIENT, "User closed RCON connection\n");
}
}
@ -1214,55 +1214,55 @@ void Mat_CrossHair_f(const CCommand& args)
CMaterialGlue* material = GetMaterialAtCrossHair();
if (material)
{
DevMsg(eDLL_T::MS, "______________________________________________________________\n");
DevMsg(eDLL_T::MS, "-+ Material --------------------------------------------------\n");
DevMsg(eDLL_T::MS, " |-- ADDR: '%llX'\n", material);
DevMsg(eDLL_T::MS, " |-- GUID: '%llX'\n", material->m_GUID);
DevMsg(eDLL_T::MS, " |-- Streaming texture count: '%d'\n", material->m_nStreamableTextureCount);
DevMsg(eDLL_T::MS, " |-- Material width: '%d'\n", material->m_iWidth);
DevMsg(eDLL_T::MS, " |-- Material height: '%d'\n", material->m_iHeight);
DevMsg(eDLL_T::MS, " |-- Flags: '%llX'\n", material->m_iFlags);
Msg(eDLL_T::MS, "______________________________________________________________\n");
Msg(eDLL_T::MS, "-+ Material --------------------------------------------------\n");
Msg(eDLL_T::MS, " |-- ADDR: '%llX'\n", material);
Msg(eDLL_T::MS, " |-- GUID: '%llX'\n", material->m_GUID);
Msg(eDLL_T::MS, " |-- Streaming texture count: '%d'\n", material->m_nStreamableTextureCount);
Msg(eDLL_T::MS, " |-- Material width: '%d'\n", material->m_iWidth);
Msg(eDLL_T::MS, " |-- Material height: '%d'\n", material->m_iHeight);
Msg(eDLL_T::MS, " |-- Flags: '%llX'\n", material->m_iFlags);
std::function<void(CMaterialGlue*, const char*)> fnPrintChild = [](CMaterialGlue* material, const char* print)
{
DevMsg(eDLL_T::MS, " |-+\n");
DevMsg(eDLL_T::MS, " | |-+ Child material ----------------------------------------\n");
DevMsg(eDLL_T::MS, print, material);
DevMsg(eDLL_T::MS, " | |-- GUID: '%llX'\n", material->m_GUID);
DevMsg(eDLL_T::MS, " | |-- Material name: '%s'\n", material->m_pszName);
Msg(eDLL_T::MS, " |-+\n");
Msg(eDLL_T::MS, " | |-+ Child material ----------------------------------------\n");
Msg(eDLL_T::MS, print, material);
Msg(eDLL_T::MS, " | |-- GUID: '%llX'\n", material->m_GUID);
Msg(eDLL_T::MS, " | |-- Material name: '%s'\n", material->m_pszName);
};
DevMsg(eDLL_T::MS, " |-- Material name: '%s'\n", material->m_pszName);
DevMsg(eDLL_T::MS, " |-- Material surface name 1: '%s'\n", material->m_pszSurfaceProp);
DevMsg(eDLL_T::MS, " |-- Material surface name 2: '%s'\n", material->m_pszSurfaceProp2);
DevMsg(eDLL_T::MS, " |-- DX buffer: '%llX'\n", material->m_pDXBuffer);
DevMsg(eDLL_T::MS, " |-- DX buffer VFTable: '%llX'\n", material->m_pID3D11BufferVTable);
Msg(eDLL_T::MS, " |-- Material name: '%s'\n", material->m_pszName);
Msg(eDLL_T::MS, " |-- Material surface name 1: '%s'\n", material->m_pszSurfaceProp);
Msg(eDLL_T::MS, " |-- Material surface name 2: '%s'\n", material->m_pszSurfaceProp2);
Msg(eDLL_T::MS, " |-- DX buffer: '%llX'\n", material->m_pDXBuffer);
Msg(eDLL_T::MS, " |-- DX buffer VFTable: '%llX'\n", material->m_pID3D11BufferVTable);
material->m_pDepthShadow
? fnPrintChild(material->m_pDepthShadow, " | |-+ DepthShadow: '%llX'\n")
: DevMsg(eDLL_T::MS, " | |-+ DepthShadow: 'NULL'\n");
: Msg(eDLL_T::MS, " | |-+ DepthShadow: 'NULL'\n");
material->m_pDepthPrepass
? fnPrintChild(material->m_pDepthPrepass, " | |-+ DepthPrepass: '%llX'\n")
: DevMsg(eDLL_T::MS, " | |-+ DepthPrepass: 'NULL'\n");
: Msg(eDLL_T::MS, " | |-+ DepthPrepass: 'NULL'\n");
material->m_pDepthVSM
? fnPrintChild(material->m_pDepthVSM, " | |-+ DepthVSM: '%llX'\n")
: DevMsg(eDLL_T::MS, " | |-+ DepthVSM: 'NULL'\n");
: Msg(eDLL_T::MS, " | |-+ DepthVSM: 'NULL'\n");
material->m_pDepthShadow
? fnPrintChild(material->m_pDepthShadow, " | |-+ DepthShadowTight: '%llX'\n")
: DevMsg(eDLL_T::MS, " | |-+ DepthShadowTight: 'NULL'\n");
: Msg(eDLL_T::MS, " | |-+ DepthShadowTight: 'NULL'\n");
material->m_pColPass
? fnPrintChild(material->m_pColPass, " | |-+ ColPass: '%llX'\n")
: DevMsg(eDLL_T::MS, " | |-+ ColPass: 'NULL'\n");
: Msg(eDLL_T::MS, " | |-+ ColPass: 'NULL'\n");
DevMsg(eDLL_T::MS, "-+ Texture GUID map ------------------------------------------\n");
DevMsg(eDLL_T::MS, " |-- Texture handles: '%llX'\n", material->m_pTextureHandles);
DevMsg(eDLL_T::MS, " |-- Streaming texture handles: '%llX'\n", material->m_pStreamableTextureHandles);
Msg(eDLL_T::MS, "-+ Texture GUID map ------------------------------------------\n");
Msg(eDLL_T::MS, " |-- Texture handles: '%llX'\n", material->m_pTextureHandles);
Msg(eDLL_T::MS, " |-- Streaming texture handles: '%llX'\n", material->m_pStreamableTextureHandles);
DevMsg(eDLL_T::MS, "--------------------------------------------------------------\n");
Msg(eDLL_T::MS, "--------------------------------------------------------------\n");
}
else
{
DevMsg(eDLL_T::MS, "%s: No material found >:(\n", __FUNCTION__);
Msg(eDLL_T::MS, "%s: No material found >:(\n", __FUNCTION__);
}
}
@ -1278,7 +1278,7 @@ void Line_f(const CCommand& args)
{
if (args.ArgC() != 7)
{
DevMsg(eDLL_T::CLIENT, "Usage 'line': start(vector) end(vector)\n");
Msg(eDLL_T::CLIENT, "Usage 'line': start(vector) end(vector)\n");
return;
}
@ -1304,7 +1304,7 @@ void Sphere_f(const CCommand& args)
{
if (args.ArgC() != 7)
{
DevMsg(eDLL_T::CLIENT, "Usage 'sphere': origin(vector) radius(float) theta(int) phi(int)\n");
Msg(eDLL_T::CLIENT, "Usage 'sphere': origin(vector) radius(float) theta(int) phi(int)\n");
return;
}
@ -1333,7 +1333,7 @@ void Capsule_f(const CCommand& args)
{
if (args.ArgC() != 10)
{
DevMsg(eDLL_T::CLIENT, "Usage 'capsule': start(vector) end(vector) radius(vector)\n");
Msg(eDLL_T::CLIENT, "Usage 'capsule': start(vector) end(vector) radius(vector)\n");
return;
}
@ -1470,7 +1470,7 @@ void CC_CreateFakePlayer_f(const CCommand& args)
{
if (args.ArgC() < 3)
{
DevMsg(eDLL_T::SERVER, "usage 'sv_addbot': name(string) teamid(int)\n");
Msg(eDLL_T::SERVER, "usage 'sv_addbot': name(string) teamid(int)\n");
return;
}

4
r5dev/common/netmessages.cpp
View File

@ -28,7 +28,7 @@ bool SVC_Print::ProcessImpl()
if (len < sizeof(m_szTextBuffer))
{
DevMsg(eDLL_T::SERVER, m_szText[len-1] == '\n' ? "%s" : "%s\n", m_szText);
Msg(eDLL_T::SERVER, m_szText[len-1] == '\n' ? "%s" : "%s\n", m_szText);
}
}
@ -56,7 +56,7 @@ bool SVC_UserMessage::ProcessImpl()
if (len && len < sizeof(text))
{
DevMsg(eDLL_T::SERVER, text[len - 1] == '\n' ? "%s" : "%s\n", text);
Msg(eDLL_T::SERVER, text[len - 1] == '\n' ? "%s" : "%s\n", text);
}
}
}

8
r5dev/core/dllmain.cpp
View File

@ -41,14 +41,14 @@ void Show_Emblem()
// Logged as 'SYSTEM_ERROR' for its red color.
for (size_t i = 0; i < SDK_ARRAYSIZE(R5R_EMBLEM); i++)
{
DevMsg(eDLL_T::SYSTEM_ERROR, "%s\n", R5R_EMBLEM[i]);
Msg(eDLL_T::SYSTEM_ERROR, "%s\n", R5R_EMBLEM[i]);
}
// Log the SDK's 'build_id' under the emblem.
DevMsg(eDLL_T::SYSTEM_ERROR,
Msg(eDLL_T::SYSTEM_ERROR,
"+------------------------------------------------[%s%010d%s]-+\n",
g_svYellowF, g_SDKDll.GetNTHeaders()->FileHeader.TimeDateStamp, g_svRedF);
DevMsg(eDLL_T::SYSTEM_ERROR, "\n");
Msg(eDLL_T::SYSTEM_ERROR, "\n");
}
//#############################################################################
@ -125,7 +125,7 @@ void SDK_Shutdown()
}
g_bSdkInitialized = false;
DevMsg(eDLL_T::NONE, "GameSDK shutdown initiated\n");
Msg(eDLL_T::NONE, "GameSDK shutdown initiated\n");
curl_global_cleanup();

38
r5dev/core/init.cpp
View File

@ -176,7 +176,7 @@ void ScriptConstantRegistrationCallback(CSquirrelVM* s)
void Systems_Init()
{
DevMsg(eDLL_T::NONE, "+-------------------------------------------------------------+\n");
Msg(eDLL_T::NONE, "+-------------------------------------------------------------+\n");
QuerySystemInfo();
DetourRegister();
@ -186,8 +186,8 @@ void Systems_Init()
DetourInit();
initTimer.End();
DevMsg(eDLL_T::NONE, "+-------------------------------------------------------------+\n");
DevMsg(eDLL_T::NONE, "%-16s '%10.6f' seconds ('%12lu' clocks)\n", "Detour->InitDB()",
Msg(eDLL_T::NONE, "+-------------------------------------------------------------+\n");
Msg(eDLL_T::NONE, "%-16s '%10.6f' seconds ('%12lu' clocks)\n", "Detour->InitDB()",
initTimer.GetDuration().GetSeconds(), initTimer.GetDuration().GetCycles());
initTimer.Start();
@ -214,10 +214,10 @@ void Systems_Init()
}
initTimer.End();
DevMsg(eDLL_T::NONE, "%-16s '%10.6f' seconds ('%12lu' clocks)\n", "Detour->Attach()",
Msg(eDLL_T::NONE, "%-16s '%10.6f' seconds ('%12lu' clocks)\n", "Detour->Attach()",
initTimer.GetDuration().GetSeconds(), initTimer.GetDuration().GetCycles());
DevMsg(eDLL_T::NONE, "+-------------------------------------------------------------+\n");
DevMsg(eDLL_T::NONE, "\n");
Msg(eDLL_T::NONE, "+-------------------------------------------------------------+\n");
Msg(eDLL_T::NONE, "\n");
ConVar_StaticInit();
@ -274,10 +274,10 @@ void Systems_Shutdown()
DetourTransactionCommit();
shutdownTimer.End();
DevMsg(eDLL_T::NONE, "%-16s '%10.6f' seconds ('%12lu' clocks)\n", "Detour->Detach()",
Msg(eDLL_T::NONE, "%-16s '%10.6f' seconds ('%12lu' clocks)\n", "Detour->Detach()",
shutdownTimer.GetDuration().GetSeconds(), shutdownTimer.GetDuration().GetCycles());
DevMsg(eDLL_T::NONE, "+-------------------------------------------------------------+\n");
DevMsg(eDLL_T::NONE, "\n");
Msg(eDLL_T::NONE, "+-------------------------------------------------------------+\n");
Msg(eDLL_T::NONE, "\n");
}
/////////////////////////////////////////////////////
@ -324,20 +324,20 @@ void QuerySystemInfo()
if (dd.StateFlags & DISPLAY_DEVICE_PRIMARY_DEVICE) // Only log the primary device.
{
DevMsg(eDLL_T::NONE, "%-25s: '%s'\n", "GPU model identifier", dd.DeviceString);
Msg(eDLL_T::NONE, "%-25s: '%s'\n", "GPU model identifier", dd.DeviceString);
}
}
#endif // !DEDICATED
const CPUInformation& pi = GetCPUInformation();
DevMsg(eDLL_T::NONE, "%-25s: '%s'\n","CPU model identifier", pi.m_szProcessorBrand);
DevMsg(eDLL_T::NONE, "%-25s: '%s'\n","CPU vendor tag", pi.m_szProcessorID);
DevMsg(eDLL_T::NONE, "%-25s: '%12hhu' ('%2hhu' %s)\n", "CPU core count", pi.m_nPhysicalProcessors, pi.m_nLogicalProcessors, "logical");
DevMsg(eDLL_T::NONE, "%-25s: '%12lld' ('%6.1f' %s)\n", "CPU core speed", pi.m_Speed, float(pi.m_Speed / 1000000), "MHz");
DevMsg(eDLL_T::NONE, "%-20s%s: '%12lu' ('0x%-8X')\n", "L1 cache", "(KiB)", pi.m_nL1CacheSizeKb, pi.m_nL1CacheDesc);
DevMsg(eDLL_T::NONE, "%-20s%s: '%12lu' ('0x%-8X')\n", "L2 cache", "(KiB)", pi.m_nL2CacheSizeKb, pi.m_nL2CacheDesc);
DevMsg(eDLL_T::NONE, "%-20s%s: '%12lu' ('0x%-8X')\n", "L3 cache", "(KiB)", pi.m_nL3CacheSizeKb, pi.m_nL3CacheDesc);
Msg(eDLL_T::NONE, "%-25s: '%s'\n","CPU model identifier", pi.m_szProcessorBrand);
Msg(eDLL_T::NONE, "%-25s: '%s'\n","CPU vendor tag", pi.m_szProcessorID);
Msg(eDLL_T::NONE, "%-25s: '%12hhu' ('%2hhu' %s)\n", "CPU core count", pi.m_nPhysicalProcessors, pi.m_nLogicalProcessors, "logical");
Msg(eDLL_T::NONE, "%-25s: '%12lld' ('%6.1f' %s)\n", "CPU core speed", pi.m_Speed, float(pi.m_Speed / 1000000), "MHz");
Msg(eDLL_T::NONE, "%-20s%s: '%12lu' ('0x%-8X')\n", "L1 cache", "(KiB)", pi.m_nL1CacheSizeKb, pi.m_nL1CacheDesc);
Msg(eDLL_T::NONE, "%-20s%s: '%12lu' ('0x%-8X')\n", "L2 cache", "(KiB)", pi.m_nL2CacheSizeKb, pi.m_nL2CacheDesc);
Msg(eDLL_T::NONE, "%-20s%s: '%12lu' ('0x%-8X')\n", "L3 cache", "(KiB)", pi.m_nL3CacheSizeKb, pi.m_nL3CacheDesc);
MEMORYSTATUSEX statex{};
statex.dwLength = sizeof(statex);
@ -350,8 +350,8 @@ void QuerySystemInfo()
DWORDLONG availPhysical = (statex.ullAvailPhys / 1024) / 1024;
DWORDLONG availVirtual = (statex.ullAvailVirtual / 1024) / 1024;
DevMsg(eDLL_T::NONE, "%-20s%s: '%12llu' ('%9llu' %s)\n", "Total system memory", "(MiB)", totalPhysical, totalVirtual, "virtual");
DevMsg(eDLL_T::NONE, "%-20s%s: '%12llu' ('%9llu' %s)\n", "Avail system memory", "(MiB)", availPhysical, availVirtual, "virtual");
Msg(eDLL_T::NONE, "%-20s%s: '%12llu' ('%9llu' %s)\n", "Total system memory", "(MiB)", totalPhysical, totalVirtual, "virtual");
Msg(eDLL_T::NONE, "%-20s%s: '%12llu' ('%9llu' %s)\n", "Avail system memory", "(MiB)", availPhysical, availVirtual, "virtual");
}
else
{

4
r5dev/engine/client/cl_rcon.cpp
View File

@ -76,7 +76,7 @@ void CRConClient::Disconnect(const char* szReason)
szReason = "unknown reason";
}
DevMsg(eDLL_T::CLIENT, "Disconnect: (%s)\n", szReason);
Msg(eDLL_T::CLIENT, "Disconnect: (%s)\n", szReason);
m_Socket.CloseAcceptedSocket(0);
}
}
@ -112,7 +112,7 @@ bool CRConClient::ProcessMessage(const char* pMsgBuf, const int nMsgLen)
}
}
DevMsg(eDLL_T::NETCON, "%s", response.responsemsg().c_str());
Msg(eDLL_T::NETCON, "%s", response.responsemsg().c_str());
break;
}
case sv_rcon::response_t::SERVERDATA_RESPONSE_CONSOLE_LOG:

2
r5dev/engine/client/client.cpp
View File

@ -111,7 +111,7 @@ void CClient::VActivatePlayer(CClient* pClient)
if (pNetChan && sv_showconnecting->GetBool())
{
DevMsg(eDLL_T::SERVER, "Activated player #%d; channel %s(%s) ('%llu')\n",
Msg(eDLL_T::SERVER, "Activated player #%d; channel %s(%s) ('%llu')\n",
pClient->GetUserID(), pNetChan->GetName(), pNetChan->GetAddress(), pClient->GetNucleusID());
}
#endif // !CLIENT_DLL

14
r5dev/engine/host_state.cpp
View File

@ -84,7 +84,7 @@ bool HostState_KeepAlive(const NetGameServer_t& netGameServer)
if (!hostToken.empty() && g_pMasterServer->GetCurrentToken().compare(hostToken) != NULL)
{
g_pMasterServer->SetCurrentToken(hostToken);
DevMsg(eDLL_T::SERVER, "Published server with token: %s'%s%s%s'\n",
Msg(eDLL_T::SERVER, "Published server with token: %s'%s%s%s'\n",
g_svReset, g_svGreyB,
hostToken.c_str(), g_svReset);
}
@ -173,13 +173,13 @@ void CHostState::FrameUpdate(CHostState* pHostState, double flCurrentTime, float
}
case HostStates_t::HS_GAME_SHUTDOWN:
{
DevMsg(eDLL_T::ENGINE, "%s: Shutdown host game\n", __FUNCTION__);
Msg(eDLL_T::ENGINE, "%s: Shutdown host game\n", __FUNCTION__);
CHostState_State_GameShutDown(g_pHostState);
break;
}
case HostStates_t::HS_RESTART:
{
DevMsg(eDLL_T::ENGINE, "%s: Restarting state machine\n", __FUNCTION__);
Msg(eDLL_T::ENGINE, "%s: Restarting state machine\n", __FUNCTION__);
#ifndef DEDICATED
CL_EndMovie();
#endif // !DEDICATED
@ -189,7 +189,7 @@ void CHostState::FrameUpdate(CHostState* pHostState, double flCurrentTime, float
}
case HostStates_t::HS_SHUTDOWN:
{
DevMsg(eDLL_T::ENGINE, "%s: Shutdown state machine\n", __FUNCTION__);
Msg(eDLL_T::ENGINE, "%s: Shutdown state machine\n", __FUNCTION__);
#ifndef DEDICATED
CL_EndMovie();
#endif // !DEDICATED
@ -410,7 +410,7 @@ void CHostState::GameShutDown(void)
//-----------------------------------------------------------------------------
void CHostState::State_NewGame(void)
{
DevMsg(eDLL_T::ENGINE, "%s: Loading level: '%s'\n", __FUNCTION__, g_pHostState->m_levelName);
Msg(eDLL_T::ENGINE, "%s: Loading level: '%s'\n", __FUNCTION__, g_pHostState->m_levelName);
LARGE_INTEGER time{};
@ -450,7 +450,7 @@ void CHostState::State_NewGame(void)
//-----------------------------------------------------------------------------
void CHostState::State_ChangeLevelSP(void)
{
DevMsg(eDLL_T::ENGINE, "%s: Changing singleplayer level to: '%s'\n", __FUNCTION__, m_levelName);
Msg(eDLL_T::ENGINE, "%s: Changing singleplayer level to: '%s'\n", __FUNCTION__, m_levelName);
m_flShortFrameTime = 1.5; // Set frame time.
if (CModelLoader__Map_IsValid(g_pModelLoader, m_levelName)) // Check if map is valid and if we can start a new game.
@ -476,7 +476,7 @@ void CHostState::State_ChangeLevelSP(void)
//-----------------------------------------------------------------------------
void CHostState::State_ChangeLevelMP(void)
{
DevMsg(eDLL_T::ENGINE, "%s: Changing multiplayer level to: '%s'\n", __FUNCTION__, m_levelName);
Msg(eDLL_T::ENGINE, "%s: Changing multiplayer level to: '%s'\n", __FUNCTION__, m_levelName);
m_flShortFrameTime = 0.5; // Set frame time.
#ifndef CLIENT_DLL

2
r5dev/engine/modelloader.cpp
View File

@ -280,7 +280,7 @@ void CMapLoadHelper::Constructor(CMapLoadHelper* loader, int lumpToLoad)
FileHandle_t hLumpFile = FileSystem()->Open(lumpPathBuf, "rb");
if (hLumpFile != FILESYSTEM_INVALID_HANDLE)
{
//DevMsg(eDLL_T::ENGINE, "Loading lump %.4x from file. Buffer: %p\n", lumpToLoad, loader->m_pRawData);
DevMsg(eDLL_T::ENGINE, "Loading lump %.4x from file. Buffer: %p\n", lumpToLoad, loader->m_pRawData);
FileSystem()->ReadEx(loader->m_pRawData, lumpSize, lumpSize, hLumpFile);
FileSystem()->Close(hLumpFile);

4
r5dev/engine/net.cpp
View File

@ -92,7 +92,7 @@ void NET_SetKey(const string& svNetKey)
{
v_NET_SetKey(g_pNetKey, svTokenizedKey.c_str());
DevMsg(eDLL_T::ENGINE, "Installed NetKey: %s'%s%s%s'\n",
Msg(eDLL_T::ENGINE, "Installed NetKey: %s'%s%s%s'\n",
g_svReset, g_svGreyB, g_pNetKey->GetBase64NetKey(), g_svReset);
}
else
@ -154,7 +154,7 @@ void NET_PrintFunc(const char* fmt, ...)
result.push_back('\n');
}
DevMsg(context, "%s", result.c_str());
Msg(context, "%s", result.c_str());
}
//-----------------------------------------------------------------------------

2
r5dev/engine/server/server.cpp
View File

@ -102,7 +102,7 @@ CClient* CServer::ConnectClient(CServer* pServer, user_creds_s* pChallenge)
const int nPort = int(ntohs(pChallenge->netAdr.GetPort()));
if (bEnableLogging)
DevMsg(eDLL_T::SERVER, "Processing connectionless challenge for '[%s]:%i' ('%llu')\n",
Msg(eDLL_T::SERVER, "Processing connectionless challenge for '[%s]:%i' ('%llu')\n",
pszAddresBuffer, nPort, nNucleusID);
bool bValidName = false;

18
r5dev/engine/server/sv_rcon.cpp
View File

@ -64,7 +64,7 @@ void CRConServer::Init(void)
m_Address.SetFromString(Format("[%s]:%i", pszAddress, hostport->GetInt()).c_str(), true);
m_Socket.CreateListenSocket(m_Address);
DevMsg(eDLL_T::SERVER, "Remote server access initialized ('%s')\n", m_Address.ToString());
Msg(eDLL_T::SERVER, "Remote server access initialized ('%s')\n", m_Address.ToString());
m_bInitialized = true;
}
@ -140,7 +140,7 @@ bool CRConServer::SetPassword(const char* pszPassword)
}
m_svPasswordHash = sha256(pszPassword);
DevMsg(eDLL_T::SERVER, "Password hash ('%s')\n", m_svPasswordHash.c_str());
Msg(eDLL_T::SERVER, "Password hash ('%s')\n", m_svPasswordHash.c_str());
m_bInitialized = true;
return true;
@ -344,7 +344,7 @@ void CRConServer::Authenticate(const cl_rcon::request& request, CConnectedNetCon
const netadr_t netAdr = m_Socket.GetAcceptedSocketAddress(m_nConnIndex);
if (sv_rcon_debug->GetBool())
{
DevMsg(eDLL_T::SERVER, "Bad RCON password attempt from '%s'\n", netAdr.ToString());
Msg(eDLL_T::SERVER, "Bad RCON password attempt from '%s'\n", netAdr.ToString());
}
SendEncode(data.m_hSocket, s_WrongPwMessage, "",
@ -367,10 +367,10 @@ bool CRConServer::Comparator(const string& svPassword) const
string passwordHash = sha256(svPassword);
if (sv_rcon_debug->GetBool())
{
DevMsg(eDLL_T::SERVER, "+---------------------------------------------------------------------------+\n");
DevMsg(eDLL_T::SERVER, "[ Server: '%s']\n", m_svPasswordHash.c_str());
DevMsg(eDLL_T::SERVER, "[ Client: '%s']\n", passwordHash.c_str());
DevMsg(eDLL_T::SERVER, "+---------------------------------------------------------------------------+\n");
Msg(eDLL_T::SERVER, "+---------------------------------------------------------------------------+\n");
Msg(eDLL_T::SERVER, "[ Server: '%s']\n", m_svPasswordHash.c_str());
Msg(eDLL_T::SERVER, "[ Client: '%s']\n", passwordHash.c_str());
Msg(eDLL_T::SERVER, "+---------------------------------------------------------------------------+\n");
}
if (memcmp(passwordHash.data(), m_svPasswordHash.data(), SHA256::DIGEST_SIZE) == 0)
{
@ -528,7 +528,7 @@ bool CRConServer::CheckForBan(CConnectedNetConsoleData& data)
{
if (sv_rcon_debug->GetBool())
{
DevMsg(eDLL_T::SERVER, "Banned list is full; dropping '%s'\n", szNetAdr);
Msg(eDLL_T::SERVER, "Banned list is full; dropping '%s'\n", szNetAdr);
}
return true;
@ -587,7 +587,7 @@ void CRConServer::Disconnect(const int nIndex, const char* szReason) // NETMGR
szReason = "unknown reason";
}
DevMsg(eDLL_T::SERVER, "Connection to '%s' lost (%s)\n", netAdr.ToString(), szReason);
Msg(eDLL_T::SERVER, "Connection to '%s' lost (%s)\n", netAdr.ToString(), szReason);
m_nAuthConnections--;
}

2
r5dev/engine/shared/shared_rcon.cpp
View File

@ -79,7 +79,7 @@ bool CL_NetConConnect(CNetConBase* pBase, const char* pHostAdr, const int nHostP
return false;
}
DevMsg(eDLL_T::CLIENT, "Connected to: %s\n", pNetAdr->ToString());
Msg(eDLL_T::CLIENT, "Connected to: %s\n", pNetAdr->ToString());
return true;
}

2
r5dev/engine/sys_dll.cpp
View File

@ -150,7 +150,7 @@ void CModAppSystemGroup::InitPluginSystem(CModAppSystemGroup* pModAppSystemGroup
for (auto& it : g_pPluginSystem->GetPluginInstances())
{
if (g_pPluginSystem->LoadPluginInstance(it))
DevMsg(eDLL_T::ENGINE, "Loaded plugin: '%s'\n", it.m_svPluginName.c_str());
Msg(eDLL_T::ENGINE, "Loaded plugin: '%s'\n", it.m_svPluginName.c_str());
else
Warning(eDLL_T::ENGINE, "Failed loading plugin: '%s'\n", it.m_svPluginName.c_str());
}

4
r5dev/filesystem/basefilesystem.cpp
View File

@ -149,7 +149,7 @@ VPKData_t* CBaseFileSystem::VMountVPKFile(CBaseFileSystem* pFileSystem, const ch
{
if (nHandle < 0) // Only log if VPK hasn't been mounted yet.
{
::DevMsg(eDLL_T::FS, "Mounted vpk file: '%s' with handle: '%i'\n", pszVpkPath, pPakData->m_nHandle);
::Msg(eDLL_T::FS, "Mounted vpk file: '%s' with handle: '%i'\n", pszVpkPath, pPakData->m_nHandle);
}
}
else // VPK failed to load or does not exist...
@ -173,7 +173,7 @@ const char* CBaseFileSystem::VUnmountVPKFile(CBaseFileSystem* pFileSystem, const
if (nHandle >= 0)
{
::DevMsg(eDLL_T::FS, "Unmounted vpk file: '%s' with handle: '%i'\n", pszVpkPath, nHandle);
::Msg(eDLL_T::FS, "Unmounted vpk file: '%s' with handle: '%i'\n", pszVpkPath, nHandle);
}
return pRet;

2
r5dev/game/client/vscript_client.cpp
View File

@ -301,7 +301,7 @@ namespace VScriptCode
if (!VALID_CHARSTAR(ipAddress) || VALID_CHARSTAR(cryptoKey))
return SQ_OK;
DevMsg(eDLL_T::UI, "Connecting to server with ip address '%s' and encryption key '%s'\n", ipAddress, cryptoKey);
Msg(eDLL_T::UI, "Connecting to server with ip address '%s' and encryption key '%s'\n", ipAddress, cryptoKey);
g_pServerListManager->ConnectToServer(ipAddress, cryptoKey);
return SQ_OK;

2
r5dev/game/server/ai_network.cpp
View File

@ -36,7 +36,7 @@ void CAI_Network::DebugConnectMsg(int node1, int node2, const char* pszFormat, .
}/////////////////////////////
DevMsg(eDLL_T::SERVER, "%s", buf);
Msg(eDLL_T::SERVER, "%s", buf);
}
}
}

76
r5dev/game/server/ai_networkmanager.cpp
View File

@ -42,9 +42,9 @@ void CAI_NetworkBuilder::SaveNetworkGraph(CAI_Network* pNetwork)
CFastTimer timer;
// Build from memory.
DevMsg(eDLL_T::SERVER, "++++--------------------------------------------------------------------------------------------------------------------------++++\n");
DevMsg(eDLL_T::SERVER, ">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> AI NETWORK GRAPH FILE CONSTRUCTION STARTED <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<\n");
DevMsg(eDLL_T::SERVER, "++++--------------------------------------------------------------------------------------------------------------------------++++\n");
Msg(eDLL_T::SERVER, "++++--------------------------------------------------------------------------------------------------------------------------++++\n");
Msg(eDLL_T::SERVER, ">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> AI NETWORK GRAPH FILE CONSTRUCTION STARTED <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<\n");
Msg(eDLL_T::SERVER, "++++--------------------------------------------------------------------------------------------------------------------------++++\n");
masterTimer.Start();
timer.Start();
@ -56,11 +56,11 @@ void CAI_NetworkBuilder::SaveNetworkGraph(CAI_Network* pNetwork)
return;
}
DevMsg(eDLL_T::SERVER, "+- Writing header...\n");
DevMsg(eDLL_T::SERVER, " |-- AINet version: '%d'\n", AINET_VERSION_NUMBER);
Msg(eDLL_T::SERVER, "+- Writing header...\n");
Msg(eDLL_T::SERVER, " |-- AINet version: '%d'\n", AINET_VERSION_NUMBER);
FileSystem()->Write(&AINET_VERSION_NUMBER, sizeof(int), pAIGraph);
DevMsg(eDLL_T::SERVER, " |-- Map version: '%d'\n", g_ServerGlobalVariables->m_nMapVersion);
Msg(eDLL_T::SERVER, " |-- Map version: '%d'\n", g_ServerGlobalVariables->m_nMapVersion);
FileSystem()->Write(&g_ServerGlobalVariables->m_nMapVersion, sizeof(int), pAIGraph);
FileHandle_t pNavMesh = FileSystem()->Open(szMeshPath, "rb", "GAME");
@ -82,18 +82,18 @@ void CAI_NetworkBuilder::SaveNetworkGraph(CAI_Network* pNetwork)
}
// Large NavMesh CRC.
DevMsg(eDLL_T::SERVER, " |-- NavMesh CRC: '0x%lX'\n", nNavMeshHash);
Msg(eDLL_T::SERVER, " |-- NavMesh CRC: '0x%lX'\n", nNavMeshHash);
FileSystem()->Write(&nNavMeshHash, sizeof(uint32_t), pAIGraph);
// Path nodes.
DevMsg(eDLL_T::SERVER, " |-- Node count: '%d'\n", pNetwork->m_iNumNodes);
Msg(eDLL_T::SERVER, " |-- Node count: '%d'\n", pNetwork->m_iNumNodes);
FileSystem()->Write(&pNetwork->m_iNumNodes, sizeof(int), pAIGraph);
timer.End();
DevMsg(eDLL_T::SERVER, "...done writing header. %lf seconds\n", timer.GetDuration().GetSeconds());
Msg(eDLL_T::SERVER, "...done writing header. %lf seconds\n", timer.GetDuration().GetSeconds());
timer.Start();
DevMsg(eDLL_T::SERVER, "+- Writing node positions...\n");
Msg(eDLL_T::SERVER, "+- Writing node positions...\n");
int nCalculatedLinkcount = 0;
@ -122,20 +122,20 @@ void CAI_NetworkBuilder::SaveNetworkGraph(CAI_Network* pNetwork)
memcpy(diskNode.unk6, pNetwork->m_pAInode[i]->unk10, sizeof(diskNode.unk6));
DevMsg(eDLL_T::SERVER, " |-- Copying node '#%d' from '0x%p' to '0x%zX'\n", pNetwork->m_pAInode[i]->m_nIndex, reinterpret_cast<void*>(pNetwork->m_pAInode[i]), FileSystem()->Tell(pAIGraph));
Msg(eDLL_T::SERVER, " |-- Copying node '#%d' from '0x%p' to '0x%zX'\n", pNetwork->m_pAInode[i]->m_nIndex, reinterpret_cast<void*>(pNetwork->m_pAInode[i]), FileSystem()->Tell(pAIGraph));
FileSystem()->Write(&diskNode, sizeof(CAI_NodeDisk), pAIGraph);
nCalculatedLinkcount += pNetwork->m_pAInode[i]->m_nNumLinks;
}
}
timer.End();
DevMsg(eDLL_T::SERVER, "...done writing node positions. %lf seconds\n", timer.GetDuration().GetSeconds());
Msg(eDLL_T::SERVER, "...done writing node positions. %lf seconds\n", timer.GetDuration().GetSeconds());
timer.Start();
DevMsg(eDLL_T::SERVER, "+- Writing links...\n");
Msg(eDLL_T::SERVER, "+- Writing links...\n");
DevMsg(eDLL_T::SERVER, " |-- Cached link count: '%d'\n", pNetwork->m_iNumLinks);
DevMsg(eDLL_T::SERVER, " |-- Calculated link count: '%d'\n", nCalculatedLinkcount);
Msg(eDLL_T::SERVER, " |-- Cached link count: '%d'\n", pNetwork->m_iNumLinks);
Msg(eDLL_T::SERVER, " |-- Calculated link count: '%d'\n", nCalculatedLinkcount);
nCalculatedLinkcount /= 2;
if (ai_ainDumpOnLoad->GetBool())
@ -166,19 +166,19 @@ void CAI_NetworkBuilder::SaveNetworkGraph(CAI_Network* pNetwork)
diskLink.unk0 = pNetwork->m_pAInode[i]->links[j]->unk1;
memcpy(diskLink.m_bHulls, pNetwork->m_pAInode[i]->links[j]->m_bHulls, sizeof(diskLink.m_bHulls));
DevMsg(eDLL_T::SERVER, " |-- Writing link '%h' => '%h' to '0x%zX'\n", diskLink.m_iSrcID, diskLink.m_iDestID, FileSystem()->Tell(pAIGraph));
Msg(eDLL_T::SERVER, " |-- Writing link '%h' => '%h' to '0x%zX'\n", diskLink.m_iSrcID, diskLink.m_iDestID, FileSystem()->Tell(pAIGraph));
FileSystem()->Write(&diskLink, sizeof(CAI_NodeLinkDisk), pAIGraph);
}
}
}
timer.End();
DevMsg(eDLL_T::SERVER, "...done writing links. %lf seconds (%d links)\n", timer.GetDuration().GetSeconds(), nCalculatedLinkcount);
Msg(eDLL_T::SERVER, "...done writing links. %lf seconds (%d links)\n", timer.GetDuration().GetSeconds(), nCalculatedLinkcount);
timer.Start();
DevMsg(eDLL_T::SERVER, "+- Writing hull data...\n");
Msg(eDLL_T::SERVER, "+- Writing hull data...\n");
// Don't know what this is, it's likely a block from tf1 that got deprecated? should just be 1 int per node.
DevMsg(eDLL_T::SERVER, " |-- Writing '%d' bytes for node block at '0x%zX'\n", pNetwork->m_iNumNodes * sizeof(uint32_t), FileSystem()->Tell(pAIGraph));
Msg(eDLL_T::SERVER, " |-- Writing '%d' bytes for node block at '0x%zX'\n", pNetwork->m_iNumNodes * sizeof(uint32_t), FileSystem()->Tell(pAIGraph));
if (pNetwork->m_iNumNodes > 0)
{
@ -190,27 +190,27 @@ void CAI_NetworkBuilder::SaveNetworkGraph(CAI_Network* pNetwork)
// TODO: This is traverse nodes i think? these aren't used in r2 ains so we can get away with just writing count=0 and skipping
// but ideally should actually dump these.
DevMsg(eDLL_T::SERVER, " |-- Writing '%d' traversal nodes at '0x%zX'\n", 0, FileSystem()->Tell(pAIGraph));
Msg(eDLL_T::SERVER, " |-- Writing '%d' traversal nodes at '0x%zX'\n", 0, FileSystem()->Tell(pAIGraph));
short traverseNodeCount = 0; // Only write count since count=0 means we don't have to actually do anything here.
FileSystem()->Write(&traverseNodeCount, sizeof(short), pAIGraph);
// TODO: Ideally these should be actually dumped, but they're always 0 in r2 from what i can tell.
DevMsg(eDLL_T::SERVER, " |-- Writing '%d' bytes for hull data block at '0x%zX'\n", (MAX_HULLS * 8), FileSystem()->Tell(pAIGraph));
Msg(eDLL_T::SERVER, " |-- Writing '%d' bytes for hull data block at '0x%zX'\n", (MAX_HULLS * 8), FileSystem()->Tell(pAIGraph));
for (int i = 0; i < (MAX_HULLS * 8); i++)
{
FileSystem()->Write("\0", sizeof(char), pAIGraph);
}
timer.End();
DevMsg(eDLL_T::SERVER, "...done writing hull data. %lf seconds\n", timer.GetDuration().GetSeconds());
Msg(eDLL_T::SERVER, "...done writing hull data. %lf seconds\n", timer.GetDuration().GetSeconds());
timer.Start();
DevMsg(eDLL_T::SERVER, "+- Writing clusters...\n");
Msg(eDLL_T::SERVER, "+- Writing clusters...\n");
FileSystem()->Write(&*g_nAiNodeClusters, sizeof(*g_nAiNodeClusters), pAIGraph);
for (int i = 0; i < *g_nAiNodeClusters; i++)
{
DevMsg(eDLL_T::SERVER, " |-- Writing cluster '#%d' at '0x%zX'\n", i, FileSystem()->Tell(pAIGraph));
Msg(eDLL_T::SERVER, " |-- Writing cluster '#%d' at '0x%zX'\n", i, FileSystem()->Tell(pAIGraph));
AINodeClusters* nodeClusters = (*g_pppAiNodeClusters)[i];
FileSystem()->Write(&nodeClusters->m_nIndex, sizeof(nodeClusters->m_nIndex), pAIGraph);
@ -238,59 +238,59 @@ void CAI_NetworkBuilder::SaveNetworkGraph(CAI_Network* pNetwork)
}
timer.End();
DevMsg(eDLL_T::SERVER, "...done writing clusters. %lf seconds (%d clusters)\n", timer.GetDuration().GetSeconds(), *g_nAiNodeClusters);
Msg(eDLL_T::SERVER, "...done writing clusters. %lf seconds (%d clusters)\n", timer.GetDuration().GetSeconds(), *g_nAiNodeClusters);
timer.Start();
DevMsg(eDLL_T::SERVER, "+- Writing cluster links...\n");
Msg(eDLL_T::SERVER, "+- Writing cluster links...\n");
FileSystem()->Write(&*g_nAiNodeClusterLinks, sizeof(*g_nAiNodeClusterLinks), pAIGraph);
for (int i = 0; i < *g_nAiNodeClusterLinks; i++)
{
// Disk and memory structs are literally identical here so just directly write.
DevMsg(eDLL_T::SERVER, " |-- Writing cluster link '#%d' at '0x%zX'\n", i, FileSystem()->Tell(pAIGraph));
Msg(eDLL_T::SERVER, " |-- Writing cluster link '#%d' at '0x%zX'\n", i, FileSystem()->Tell(pAIGraph));
FileSystem()->Write(&*g_pppAiNodeClusterLinks[i], sizeof(*(*g_pppAiNodeClusterLinks)[i]), pAIGraph);
}
timer.End();
DevMsg(eDLL_T::SERVER, "...done writing cluster links. %lf seconds (%d cluster links)\n", timer.GetDuration().GetSeconds(), *g_nAiNodeClusterLinks);
Msg(eDLL_T::SERVER, "...done writing cluster links. %lf seconds (%d cluster links)\n", timer.GetDuration().GetSeconds(), *g_nAiNodeClusterLinks);
// This is always set to '-1'. Likely a field for maintaining compatibility.
FileSystem()->Write(&pNetwork->unk5, sizeof(pNetwork->unk5), pAIGraph);
// AIN v57 and above only (not present in r1, static array in r2, pointer to dynamic array in r5).
timer.Start();
DevMsg(eDLL_T::SERVER, "+- Writing script nodes...\n");
Msg(eDLL_T::SERVER, "+- Writing script nodes...\n");
FileSystem()->Write(&pNetwork->m_iNumScriptNodes, sizeof(pNetwork->m_iNumScriptNodes), pAIGraph);
for (int i = 0; i < pNetwork->m_iNumScriptNodes; i++)
{
// Disk and memory structs for script nodes are identical.
DevMsg(eDLL_T::SERVER, " |-- Writing script node '#%d' at '0x%zX'\n", i, FileSystem()->Tell(pAIGraph));
Msg(eDLL_T::SERVER, " |-- Writing script node '#%d' at '0x%zX'\n", i, FileSystem()->Tell(pAIGraph));
FileSystem()->Write(&pNetwork->m_ScriptNode[i], sizeof(CAI_ScriptNode), pAIGraph);
}
timer.End();
DevMsg(eDLL_T::SERVER, "...done writing script nodes. %lf seconds (%d nodes)\n", timer.GetDuration().GetSeconds(), pNetwork->m_iNumScriptNodes);
Msg(eDLL_T::SERVER, "...done writing script nodes. %lf seconds (%d nodes)\n", timer.GetDuration().GetSeconds(), pNetwork->m_iNumScriptNodes);
timer.Start();
DevMsg(eDLL_T::SERVER, "+- Writing hint data...\n");
Msg(eDLL_T::SERVER, "+- Writing hint data...\n");
FileSystem()->Write(&pNetwork->m_iNumHints, sizeof(pNetwork->m_iNumHints), pAIGraph);
for (int i = 0; i < pNetwork->m_iNumHints; i++)
{
DevMsg(eDLL_T::SERVER, " |-- Writing hint data '#%d' at '0x%zX'\n", i, FileSystem()->Tell(pAIGraph));
Msg(eDLL_T::SERVER, " |-- Writing hint data '#%d' at '0x%zX'\n", i, FileSystem()->Tell(pAIGraph));
FileSystem()->Write(&pNetwork->m_Hints[i], sizeof(pNetwork->m_Hints[i]), pAIGraph);
}
timer.End();
DevMsg(eDLL_T::SERVER, "...done writing hint data. %lf seconds (%d hints)\n", timer.GetDuration().GetSeconds(), pNetwork->m_iNumHints);
Msg(eDLL_T::SERVER, "...done writing hint data. %lf seconds (%d hints)\n", timer.GetDuration().GetSeconds(), pNetwork->m_iNumHints);
FileSystem()->Close(pAIGraph);
masterTimer.End();
DevMsg(eDLL_T::SERVER, "...done writing AI node graph. %lf seconds\n", masterTimer.GetDuration().GetSeconds());
DevMsg(eDLL_T::SERVER, "++++--------------------------------------------------------------------------------------------------------------------------++++\n");
DevMsg(eDLL_T::SERVER, "++++--------------------------------------------------------------------------------------------------------------------------++++\n");
Msg(eDLL_T::SERVER, "...done writing AI node graph. %lf seconds\n", masterTimer.GetDuration().GetSeconds());
Msg(eDLL_T::SERVER, "++++--------------------------------------------------------------------------------------------------------------------------++++\n");
Msg(eDLL_T::SERVER, "++++--------------------------------------------------------------------------------------------------------------------------++++\n");
}
/*
@ -392,7 +392,7 @@ void CAI_NetworkManager::LoadNetworkGraphEx(CAI_NetworkManager* pAINetworkManage
if (ai_ainDumpOnLoad->GetBool())
{
DevMsg(eDLL_T::SERVER, "Reparsing AI Network '%s'\n", szAIGraphFile);
Msg(eDLL_T::SERVER, "Reparsing AI Network '%s'\n", szAIGraphFile);
CAI_NetworkBuilder::SaveNetworkGraph(*(CAI_Network**)(reinterpret_cast<char*>(pAINetworkManager) + AINETWORK_OFFSET));
}
}

6
r5dev/gameui/IBrowser.cpp
View File

@ -367,7 +367,7 @@ void CBrowser::BrowserPanel(void)
//-----------------------------------------------------------------------------
void CBrowser::RefreshServerList(void)
{
DevMsg(eDLL_T::CLIENT, "Refreshing server list with matchmaking host '%s'\n", pylon_matchmaking_hostname->GetString());
Msg(eDLL_T::CLIENT, "Refreshing server list with matchmaking host '%s'\n", pylon_matchmaking_hostname->GetString());
std::string svServerListMessage;
g_pServerListManager->RefreshServerList(svServerListMessage);
@ -656,7 +656,7 @@ void CBrowser::HostPanel(void)
if (ImGui::Button("AI settings reparse", ImVec2(ImGui::GetWindowContentRegionWidth(), 32)))
{
DevMsg(eDLL_T::ENGINE, "Reparsing AI data on %s\n", g_pClientState->IsActive() ? "server and client" : "server");
Msg(eDLL_T::ENGINE, "Reparsing AI data on %s\n", g_pClientState->IsActive() ? "server and client" : "server");
ProcessCommand("aisettings_reparse");
if (g_pClientState->IsActive())
@ -667,7 +667,7 @@ void CBrowser::HostPanel(void)
if (ImGui::Button("Weapon settings reparse", ImVec2(ImGui::GetWindowContentRegionWidth(), 32)))
{
DevMsg(eDLL_T::ENGINE, "Reparsing weapon data on %s\n", g_pClientState->IsActive() ? "server and client" : "server");
Msg(eDLL_T::ENGINE, "Reparsing weapon data on %s\n", g_pClientState->IsActive() ? "server and client" : "server");
ProcessCommand("weapon_reparse");
}
}

2
r5dev/launcher/launcher.cpp
View File

@ -21,7 +21,7 @@ int LauncherMain(HINSTANCE hInstance)
spdlog::flush_every(std::chrono::seconds(5));
int results = v_LauncherMain(hInstance);
DevMsg(eDLL_T::NONE, "%s returned: %s\n", __FUNCTION__, ExitCodeToString(results));
Msg(eDLL_T::NONE, "%s returned: %s\n", __FUNCTION__, ExitCodeToString(results));
return results;
}

4
r5dev/materialsystem/cmaterialsystem.cpp
View File

@ -51,14 +51,14 @@ void StreamDB_Init(const char* pszLevelName)
if (pStreamKV)
{
const char* pszColumnName = pStreamKV->GetString();
DevMsg(eDLL_T::MS, "StreamDB_Init: Loading override STBSP file '%s.stbsp'\n", pszColumnName);
Msg(eDLL_T::MS, "StreamDB_Init: Loading override STBSP file '%s.stbsp'\n", pszColumnName);
v_StreamDB_Init(pszColumnName);
return;
}
}
DevMsg(eDLL_T::MS, "StreamDB_Init: Loading STBSP file '%s.stbsp'\n", pszLevelName);
Msg(eDLL_T::MS, "StreamDB_Init: Loading STBSP file '%s.stbsp'\n", pszLevelName);
v_StreamDB_Init(pszLevelName);
}

2
r5dev/mathlib/vector.h
View File

@ -1958,7 +1958,7 @@ void Quaternion::Print() const
{
#ifndef _CERT
#if !defined(__SPU__)
DevMsg(eDLL_T::COMMON, "q{ %.3fi + %.3fj + %.3fk + %.3f }", x, y, z, w);
Msg(eDLL_T::COMMON, "q{ %.3fi + %.3fj + %.3fk + %.3f }", x, y, z, w);
#endif
#endif
}

8
r5dev/netconsole/netconsole.cpp
View File

@ -59,7 +59,7 @@ bool CNetCon::Init(const bool bAnsiColor)
m_bInitialized = true;
TermSetup(bAnsiColor);
DevMsg(eDLL_T::NONE, "R5 TCP net console [Version %s]\n", NETCON_VERSION);
Msg(eDLL_T::NONE, "R5 TCP net console [Version %s]\n", NETCON_VERSION);
static std::thread frame([this]()
{
@ -223,7 +223,7 @@ void CNetCon::RunFrame(void)
}
else if (m_bPromptConnect)
{
DevMsg(eDLL_T::NONE, "Enter [<IP>]:<PORT> or <IP> <PORT>: ");
Msg(eDLL_T::NONE, "Enter [<IP>]:<PORT> or <IP> <PORT>: ");
m_bPromptConnect = false;
}
@ -252,7 +252,7 @@ void CNetCon::Disconnect(const char* szReason)
szReason = "unknown reason";
}
DevMsg(eDLL_T::CLIENT, "Disconnect: (%s)\n", szReason);
Msg(eDLL_T::CLIENT, "Disconnect: (%s)\n", szReason);
m_Socket.CloseAcceptedSocket(0);
}
@ -295,7 +295,7 @@ bool CNetCon::ProcessMessage(const char* pMsgBuf, const int nMsgLen)
}
}
DevMsg(eDLL_T::NETCON, "%s", response.responsemsg().c_str());
Msg(eDLL_T::NETCON, "%s", response.responsemsg().c_str());
break;
}
case sv_rcon::response_t::SERVERDATA_RESPONSE_CONSOLE_LOG:

10
r5dev/networksystem/bansystem.cpp
View File

@ -268,7 +268,7 @@ void CBanSystem::UnbanPlayer(const char* criteria)
if (bSave)
{
Save(); // Save modified vector to file.
DevMsg(eDLL_T::SERVER, "Removed '%s' from banned list\n", criteria);
Msg(eDLL_T::SERVER, "Removed '%s' from banned list\n", criteria);
}
}
catch (const std::exception& e)
@ -319,11 +319,11 @@ void CBanSystem::AuthorPlayerByName(const char* playerName, const bool shouldBan
if (bSave)
{
Save();
DevMsg(eDLL_T::SERVER, "Added '%s' to banned list\n", playerName);
Msg(eDLL_T::SERVER, "Added '%s' to banned list\n", playerName);
}
else if (bDisconnect)
{
DevMsg(eDLL_T::SERVER, "Kicked '%s' from server\n", playerName);
Msg(eDLL_T::SERVER, "Kicked '%s' from server\n", playerName);
}
}
@ -394,11 +394,11 @@ void CBanSystem::AuthorPlayerById(const char* playerHandle, const bool shouldBan
if (bSave)
{
Save();
DevMsg(eDLL_T::SERVER, "Added '%s' to banned list\n", playerHandle);
Msg(eDLL_T::SERVER, "Added '%s' to banned list\n", playerHandle);
}
else if (bDisconnect)
{
DevMsg(eDLL_T::SERVER, "Kicked '%s' from server\n", playerHandle);
Msg(eDLL_T::SERVER, "Kicked '%s' from server\n", playerHandle);
}
}
catch (const std::exception& e)

2
r5dev/networksystem/listmanager.cpp
View File

@ -66,7 +66,7 @@ void CServerListManager::LaunchServer(const bool bChangeLevel) const
return;
}
DevMsg(eDLL_T::ENGINE, "Starting server with name: \"%s\" map: \"%s\" playlist: \"%s\"\n",
Msg(eDLL_T::ENGINE, "Starting server with name: \"%s\" map: \"%s\" playlist: \"%s\"\n",
m_Server.m_svHostName.c_str(), m_Server.m_svHostMap.c_str(), m_Server.m_svPlaylist.c_str());
/*

6
r5dev/networksystem/pylon.cpp
View File

@ -354,7 +354,7 @@ bool CPylon::QueryServer(const char* endpoint, const char* request,
if (showDebug)
{
DevMsg(eDLL_T::ENGINE, "Sending request to '%s' with endpoint '%s':\n%s\n",
Msg(eDLL_T::ENGINE, "Sending request to '%s' with endpoint '%s':\n%s\n",
hostName, endpoint, request);
}
@ -388,7 +388,7 @@ bool CPylon::QueryServer(const char* endpoint, const char* request,
if (showDebug)
{
DevMsg(eDLL_T::ENGINE, "Host '%s' replied with status: '%d'\n",
Msg(eDLL_T::ENGINE, "Host '%s' replied with status: '%d'\n",
hostName, outStatus);
}
@ -456,7 +456,7 @@ void CPylon::LogBody(const nlohmann::json& responseJson) const
if (pylon_showdebuginfo->GetBool())
{
const string responseBody = responseJson.dump(4);
DevMsg(eDLL_T::ENGINE, "\n%s\n", responseBody.c_str());
Msg(eDLL_T::ENGINE, "\n%s\n", responseBody.c_str());
}
}

4
r5dev/pluginsystem/modsystem.cpp
View File

@ -89,7 +89,7 @@ void CModSystem::UpdateModStatusList()
if (!enabledList.HasElement(mod->m_ModID))
{
if (modsystem_debug->GetBool())
DevMsg(eDLL_T::ENGINE, "Mod '%s' does not exist in '%s'; enabling...\n",
Msg(eDLL_T::ENGINE, "Mod '%s' does not exist in '%s'; enabling...\n",
mod->m_ModID.Get(), MOD_STATUS_LIST_FILE);
mod->SetState(eModState::ENABLED);
@ -100,7 +100,7 @@ void CModSystem::UpdateModStatusList()
mod->SetState(bEnable ? eModState::ENABLED : eModState::DISABLED);
if (modsystem_debug->GetBool())
DevMsg(eDLL_T::ENGINE, "Mod '%s' exists in '%s' and is %s.\n",
Msg(eDLL_T::ENGINE, "Mod '%s' exists in '%s' and is %s.\n",
mod->m_ModID.Get(), MOD_STATUS_LIST_FILE, bEnable ? "enabled" : "disabled");
}
}

10
r5dev/public/tier0/dbg.h
View File

@ -108,11 +108,19 @@ void CoreMsg(LogType_t logType, LogLevel_t logLevel, eDLL_T context,
const UINT exitCode, const char* pszLogger, const char* pszFormat, ...);
// These functions do not return.
PLATFORM_INTERFACE void DevMsg(eDLL_T context, const char* fmt, ...) FMTFUNCTION(2, 3);
PLATFORM_INTERFACE void Msg(eDLL_T context, const char* fmt, ...) FMTFUNCTION(2, 3);
PLATFORM_INTERFACE void NetMsg(LogType_t logType, eDLL_T context, const char* uptime, const char* fmt, ...) FMTFUNCTION(4, 5);
PLATFORM_INTERFACE void Warning(eDLL_T context, const char* fmt, ...) FMTFUNCTION(2, 3);
PLATFORM_INTERFACE void Error(eDLL_T context, const UINT code, const char* fmt, ...) FMTFUNCTION(3, 4);
#if defined DBGFLAG_STRINGS_STRIP
#define DevMsg( ... ) ((void)0)
#define DevWarning( ... ) ((void)0)
#else // DBGFLAG_STRINGS_STRIP
PLATFORM_INTERFACE void DevMsg(eDLL_T context, const char* fmt, ...) FMTFUNCTION(2, 3);
PLATFORM_INTERFACE void DevWarning(eDLL_T context, const char* fmt, ...) FMTFUNCTION(2, 3);
#endif
// You can use this macro like a runtime assert macro.
// If the condition fails, then Error is called with the message. This macro is called
// like AssertMsg, where msg must be enclosed in parenthesis:

4
r5dev/public/tier1/stringpool.h
View File

@ -344,10 +344,10 @@ inline void CCountedStringPoolBase<T>::SpewStrings()
{
char* string = m_Elements[i].pString;
Msg("String %d: ref:%d %s\n", i, m_Elements[i].nReferenceCount, string == NULL? "EMPTY - ok for slot zero only!" : string);
DevMsg("String %d: ref:%d %s\n", i, m_Elements[i].nReferenceCount, string == NULL? "EMPTY - ok for slot zero only!" : string);
}
Msg("\n%d total counted strings.", m_Elements.Count());
DevMsg("\n%d total counted strings.", m_Elements.Count());
}
#define STRING_POOL_VERSION MAKEID( 'C', 'S', 'P', '1' )

16
r5dev/public/tier1/utlbuffer.h
View File

@ -1404,15 +1404,15 @@ inline void* CUtlBuffer::Detach()
inline void CUtlBuffer::Spew()
{
//SeekGet(CUtlBuffer::SEEK_HEAD, 0);
SeekGet(CUtlBuffer::SEEK_HEAD, 0);
//char pTmpLine[1024];
//while (IsValid() && GetBytesRemaining())
//{
// memset(pTmpLine, 0, sizeof(pTmpLine));
// Get(pTmpLine, MIN((size_t)GetBytesRemaining(), sizeof(pTmpLine) - 1));
// DevMsg(eDLL_T::COMMON, _T("%s"), pTmpLine);
//}
char pTmpLine[1024];
while (IsValid() && GetBytesRemaining())
{
memset(pTmpLine, 0, sizeof(pTmpLine));
Get(pTmpLine, MIN((size_t)GetBytesRemaining(), sizeof(pTmpLine) - 1));
DevMsg(eDLL_T::COMMON, "%s", pTmpLine);
}
}
#if !defined(_GAMECONSOLE)

4
r5dev/rtech/rtech_game.cpp
View File

@ -36,7 +36,7 @@ RPakHandle_t CPakFile::LoadAsync(const char* szPakFileName, CAlignedMemAlloc* pM
if (FileExists(pakOverridePath.Get()) || FileExists(pakBasePath.Get()))
{
DevMsg(eDLL_T::RTECH, "Loading pak file: '%s'\n", szPakFileName);
Msg(eDLL_T::RTECH, "Loading pak file: '%s'\n", szPakFileName);
pakHandle = CPakFile_LoadAsync(szPakFileName, pMalloc, nIdx, bUnk);
if (pakHandle == INVALID_PAK_HANDLE)
@ -62,7 +62,7 @@ void CPakFile::UnloadPak(RPakHandle_t handle)
if (pakInfo && pakInfo->m_pszFileName)
{
DevMsg(eDLL_T::RTECH, "Unloading pak file: '%s'\n", pakInfo->m_pszFileName);
Msg(eDLL_T::RTECH, "Unloading pak file: '%s'\n", pakInfo->m_pszFileName);
if (strcmp(pakInfo->m_pszFileName, "mp_lobby.rpak") == 0)
s_bBasePaksInitialized = false;

4
r5dev/rtech/rtech_utils.cpp
View File

@ -636,7 +636,7 @@ int32_t RTech::OpenFile(const CHAR* szFilePath, void* unused, LONGLONG* fileSize
return -1;
if (rtech_debug->GetBool())
DevMsg(eDLL_T::RTECH, "Opened file: '%s'\n", szFileToLoad);
Msg(eDLL_T::RTECH, "Opened file: '%s'\n", szFileToLoad);
if (fileSizeOut)
{
@ -746,7 +746,7 @@ void RTech::PakProcessGuidRelationsForAsset(PakFile_t* pPak, RPakAssetEntry_t* p
const bool bDebug = rtech_debug->GetBool();
if (bDebug)
DevMsg(eDLL_T::RTECH, "Processing GUID relations for asset '0x%-16llX' in pak '%-32s'. Uses: %-4i\n", pAsset->m_Guid, pPak->m_pszFileName, pAsset->m_nUsesCount);
Msg(eDLL_T::RTECH, "Processing GUID relations for asset '0x%-16llX' in pak '%-32s'. Uses: %-4i\n", pAsset->m_Guid, pPak->m_pszFileName, pAsset->m_nUsesCount);
for (uint32_t i = 0; i < pAsset->m_nUsesCount; i++)
{

4
r5dev/thirdparty/imgui/misc/imgui_utility.cpp vendored
View File

@ -15,7 +15,7 @@
void ImGuiConfig::Load()
{
const string svPath = Format(SDK_SYSTEM_CFG_PATH"%s", IMGUI_BIND_FILE);
DevMsg(eDLL_T::MS, "Loading ImGui config file '%s'\n", svPath.c_str());
Msg(eDLL_T::MS, "Loading ImGui config file '%s'\n", svPath.c_str());
FileSystem()->CreateDirHierarchy(SDK_SYSTEM_CFG_PATH, "PLATFORM"); // Create directory, so ImGui can load/save 'layout.ini'.
KeyValues* pKeyMapKV = FileSystem()->LoadKeyValues(IFileSystem::TYPE_COMMON, svPath.c_str(), "PLATFORM");
@ -45,7 +45,7 @@ void ImGuiConfig::Load()
void ImGuiConfig::Save()
{
const string svPath = Format(SDK_SYSTEM_CFG_PATH"%s", IMGUI_BIND_FILE);
DevMsg(eDLL_T::MS, "Saving ImGui config file '%s'\n", svPath.c_str());
Msg(eDLL_T::MS, "Saving ImGui config file '%s'\n", svPath.c_str());
FileSystem()->CreateDirHierarchy(SDK_SYSTEM_CFG_PATH, "PLATFORM"); // Create directory, so ImGui can load/save 'layout.ini'.

29
r5dev/tier0/dbg.cpp
View File

@ -148,7 +148,7 @@ void CoreMsg(LogType_t logType, LogLevel_t logLevel, eDLL_T context,
// Input : context -
// *fmt - ... -
//-----------------------------------------------------------------------------
void DevMsg(eDLL_T context, const char* fmt, ...)
void Msg(eDLL_T context, const char* fmt, ...)
{
va_list args;
va_start(args, fmt);
@ -195,3 +195,30 @@ void Error(eDLL_T context, const UINT code, const char* fmt, ...)
CoreMsgV(LogType_t::LOG_ERROR, LogLevel_t::LEVEL_NOTIFY, context, "sdk(error)", fmt, args, code);
va_end(args);
}
#ifndef DBGFLAG_STRINGS_STRIP
//-----------------------------------------------------------------------------
// Purpose: Prints general debugging messages (uncertain builds only!)
// Input : context -
// *fmt - ... -
//-----------------------------------------------------------------------------
void DevMsg(eDLL_T context, const char* fmt, ...)
{
va_list args;
va_start(args, fmt);
CoreMsgV(LogType_t::LOG_INFO, LogLevel_t::LEVEL_NOTIFY, context, "sdk", fmt, args);
va_end(args);
}
//-----------------------------------------------------------------------------
// Purpose: Print engine and SDK warnings (uncertain builds only!)
// Input : context -
// *fmt - ... -
//-----------------------------------------------------------------------------
void DevWarning(eDLL_T context, const char* fmt, ...)
{
va_list args;
va_start(args, fmt);
CoreMsgV(LogType_t::LOG_WARNING, LogLevel_t::LEVEL_NOTIFY, context, "sdk(warning)", fmt, args);
va_end(args);
}
#endif // !DBGFLAG_STRINGS_STRIP

30
r5dev/tier1/cvar.cpp
View File

@ -208,11 +208,11 @@ void ConVar_PrintDescription(ConCommandBase* pVar)
pStr = pVar->GetHelpText();
if (pStr && *pStr)
{
DevMsg(eDLL_T::COMMON, "%-80s - %.80s\n", outstr, pStr);
Msg(eDLL_T::COMMON, "%-80s - %.80s\n", outstr, pStr);
}
else
{
DevMsg(eDLL_T::COMMON, "%-80s\n", outstr);
Msg(eDLL_T::COMMON, "%-80s\n", outstr);
}
}
@ -285,7 +285,7 @@ static void PrintCvar(ConVar* var, bool logging, FileHandle_t& fh)
}
// Print to console
DevMsg(eDLL_T::COMMON, "%-40s : %-8s : %-16s : %s\n", var->GetName(),
Msg(eDLL_T::COMMON, "%-40s : %-8s : %-16s : %s\n", var->GetName(),
valstr, flagstr, StripTabsAndReturns(var->GetHelpText(), tempbuff, sizeof(tempbuff)));
if (logging)
{
@ -303,7 +303,7 @@ static void PrintCommand(const ConCommand* cmd, bool logging, FileHandle_t& f)
{
// Print to console
char tempbuff[512] = { 0 };
DevMsg(eDLL_T::COMMON, "%-40s : %-8s : %-16s : %s\n", cmd->GetName(),
Msg(eDLL_T::COMMON, "%-40s : %-8s : %-16s : %s\n", cmd->GetName(),
"cmd", "", StripTabsAndReturns(cmd->GetHelpText(), tempbuff, sizeof(tempbuff)));
if (logging)
@ -422,7 +422,7 @@ void CCvarUtilities::CvarList(const CCommand& args)
// Print usage?
if (iArgs == 2 && !Q_strcasecmp(args[1], "?"))
{
DevMsg(eDLL_T::COMMON, "convar_list: [ log logfile ] [ partial ]\n");
Msg(eDLL_T::COMMON, "convar_list: [ log logfile ] [ partial ]\n");
return;
}
@ -437,7 +437,7 @@ void CCvarUtilities::CvarList(const CCommand& args)
}
else
{
DevMsg(eDLL_T::COMMON, "Couldn't open '%s' for writing!\n", fn);
Msg(eDLL_T::COMMON, "Couldn't open '%s' for writing!\n", fn);
return;
}
@ -454,7 +454,7 @@ void CCvarUtilities::CvarList(const CCommand& args)
}
// Banner
DevMsg(eDLL_T::COMMON, "convar list\n--------------\n");
Msg(eDLL_T::COMMON, "convar list\n--------------\n");
CUtlRBTree< ConCommandBase* > sorted(0, 0, ConCommandBaseLessFunc);
CCvar::CCVarIteratorInternal* itint = g_pCVar->FactoryInternalIterator();
@ -511,12 +511,12 @@ void CCvarUtilities::CvarList(const CCommand& args)
// Show total and syntax help...
if (partial && partial[0])
{
DevMsg(eDLL_T::COMMON, "--------------\n%3i convars/concommands for [%s]\n",
Msg(eDLL_T::COMMON, "--------------\n%3i convars/concommands for [%s]\n",
sorted.Count(), partial);
}
else
{
DevMsg(eDLL_T::COMMON, "--------------\n%3i total convars/concommands\n",
Msg(eDLL_T::COMMON, "--------------\n%3i total convars/concommands\n",
sorted.Count());
}
@ -536,7 +536,7 @@ void CCvarUtilities::CvarHelp(const CCommand& args)
if (args.ArgC() != 2)
{
DevMsg(eDLL_T::COMMON, "Usage: help <cvarname>\n");
Msg(eDLL_T::COMMON, "Usage: help <cvarname>\n");
return;
}
@ -547,7 +547,7 @@ void CCvarUtilities::CvarHelp(const CCommand& args)
var = g_pCVar->FindCommandBase(search);
if (!var)
{
DevMsg(eDLL_T::COMMON, "help: no cvar or command named %s\n", search);
Msg(eDLL_T::COMMON, "help: no cvar or command named %s\n", search);
return;
}
@ -584,7 +584,7 @@ void CCvarUtilities::CvarDifferences(const CCommand& args)
}
delete itint;
DevMsg(eDLL_T::COMMON, "--------------\n%3i changed convars\n", i);
Msg(eDLL_T::COMMON, "--------------\n%3i changed convars\n", i);
}
//-----------------------------------------------------------------------------
@ -594,12 +594,12 @@ void CCvarUtilities::CvarFindFlags_f(const CCommand& args)
{
if (args.ArgC() < 2)
{
DevMsg(eDLL_T::COMMON, "Usage: convar_findByFlags <string>\n");
DevMsg(eDLL_T::COMMON, "Available flags to search for: \n");
Msg(eDLL_T::COMMON, "Usage: convar_findByFlags <string>\n");
Msg(eDLL_T::COMMON, "Available flags to search for: \n");
for (int i = 0; i < ARRAYSIZE(g_ConVarFlags.m_FlagsToDesc); i++)
{
DevMsg(eDLL_T::COMMON, " - %s\n", g_ConVarFlags.m_FlagsToDesc[i].desc);
Msg(eDLL_T::COMMON, " - %s\n", g_ConVarFlags.m_FlagsToDesc[i].desc);
}
return;
}

10
r5dev/vpklib/packedstore.cpp
View File

@ -363,7 +363,7 @@ bool CPackedStore::Deduplicate(const uint8_t* pEntryBuffer, VPKChunkDescriptor_t
auto p = m_ChunkHashMap.insert({ entryHash.c_str(), descriptor });
if (!p.second) // Map to existing chunk to avoid having copies of the same data.
{
DevMsg(eDLL_T::FS, "Mapping chunk '%zu' ('%s') to existing chunk at '0x%llx'\n",
Msg(eDLL_T::FS, "Mapping chunk '%zu' ('%s') to existing chunk at '0x%llx'\n",
chunkIndex, entryHash.c_str(), p.first->second.m_nPackFileOffset);
descriptor = p.first->second;
@ -495,7 +495,7 @@ void CPackedStore::PackWorkspace(const VPKPair_t& vpkPair, const char* workspace
FileSystem()->Read(pBuf.get(), nLen, hAsset);
FileSystem()->Seek(hAsset, 0, FileSystemSeek_t::FILESYSTEM_SEEK_HEAD);
DevMsg(eDLL_T::FS, "Packing entry '%i' ('%s')\n", i, szDestPath);
Msg(eDLL_T::FS, "Packing entry '%i' ('%s')\n", i, szDestPath);
int index = entryBlocks.AddToTail(VPKEntryBlock_t(
pBuf.get(),
nLen,
@ -548,7 +548,7 @@ void CPackedStore::PackWorkspace(const VPKPair_t& vpkPair, const char* workspace
FileSystem()->Close(hAsset);
}
DevMsg(eDLL_T::FS, "*** Build block totaling '%zd' bytes with '%zu' shared bytes among '%zu' chunks\n", FileSystem()->Tell(hPackFile), nSharedTotal, nSharedCount);
Msg(eDLL_T::FS, "*** Build block totaling '%zd' bytes with '%zu' shared bytes among '%zu' chunks\n", FileSystem()->Tell(hPackFile), nSharedTotal, nSharedCount);
FileSystem()->Close(hPackFile);
m_ChunkHashMap.clear();
@ -626,7 +626,7 @@ void CPackedStore::UnpackWorkspace(const VPKDir_t& vpkDir, const char* workspace
continue;
}
DevMsg(eDLL_T::FS, "Unpacking entry '%i' from block '%hu' ('%s')\n",
Msg(eDLL_T::FS, "Unpacking entry '%i' from block '%hu' ('%s')\n",
j, packFileIndex, pEntryPath);
FOR_EACH_VEC(entryBlock.m_Fragments, k)
@ -1133,7 +1133,7 @@ void VPKDir_t::BuildDirectoryFile(const CUtlString& directoryPath, const CUtlVec
WriteTreeSize(hDirectoryFile);
FileSystem()->Close(hDirectoryFile);
DevMsg(eDLL_T::FS, "*** Build directory totaling '%zu' bytes with '%i' entries and '%i' descriptors\n",
Msg(eDLL_T::FS, "*** Build directory totaling '%zu' bytes with '%i' entries and '%i' descriptors\n",
size_t(sizeof(VPKDirHeader_t) + m_Header.m_nDirectorySize), entryBlocks.Count(), nDescriptors);
}
//-----------------------------------------------------------------------------

2
r5dev/vscript/languages/squirrel_re/vsquirrel.cpp
View File

@ -32,7 +32,7 @@ SQBool CSquirrelVM::Init(CSquirrelVM* s, SQCONTEXT context, SQFloat curTime)
return false;
}
DevMsg((eDLL_T)context, "Created %s VM: '0x%p'\n", s->GetVM()->_sharedstate->_contextname, s);
Msg((eDLL_T)context, "Created %s VM: '0x%p'\n", s->GetVM()->_sharedstate->_contextname, s);
switch (context)
{

6
r5dev/vscript/vscript.cpp
View File

@ -37,7 +37,7 @@ CSquirrelVM* Script_GetScriptHandle(const SQCONTEXT context)
//---------------------------------------------------------------------------------
RSON::Node_t* Script_LoadScriptList(const SQChar* rsonfile)
{
DevMsg(eDLL_T::ENGINE, "Loading script list: '%s'\n", rsonfile);
Msg(eDLL_T::ENGINE, "Loading script list: '%s'\n", rsonfile);
return v_Script_LoadScriptList(rsonfile);
}
@ -84,7 +84,7 @@ SQBool Script_ParseScriptList(SQCONTEXT context, const char* scriptListPath,
SQBool Script_PrecompileScripts(CSquirrelVM* vm)
{
SQCONTEXT context = vm->GetContext();
DevMsg(eDLL_T(context), "Starting script compiler...\n");
Msg(eDLL_T(context), "Starting script compiler...\n");
CFastTimer timer;
timer.Start();
@ -108,7 +108,7 @@ SQBool Script_PrecompileScripts(CSquirrelVM* vm)
}
timer.End();
DevMsg(eDLL_T(context), "Script compiler finished in %lf seconds\n", timer.GetDuration().GetSeconds());
Msg(eDLL_T(context), "Script compiler finished in %lf seconds\n", timer.GetDuration().GetSeconds());
return result;
}

6
r5dev/vstdlib/concommandhash.cpp
View File

@ -190,7 +190,7 @@ CConCommandHash::CCommandHashHandle_t CConCommandHash::Find(const ConCommandBase
// Dump a report to MSG
void CConCommandHash::Report(void)
{
DevMsg(eDLL_T::COMMON, "Console command hash bucket load:\n");
Msg(eDLL_T::COMMON, "Console command hash bucket load:\n");
int total = 0;
for (int iBucket = 0; iBucket < kNUM_BUCKETS; ++iBucket)
{
@ -202,10 +202,10 @@ void CConCommandHash::Report(void)
iElement = m_aDataPool.Next(iElement);
}
DevMsg(eDLL_T::COMMON, "%d: %d\n", iBucket, count);
Msg(eDLL_T::COMMON, "%d: %d\n", iBucket, count);
total += count;
}
DevMsg(eDLL_T::COMMON, "\tAverage: %.1f\n", total / ((float)(kNUM_BUCKETS)));
Msg(eDLL_T::COMMON, "\tAverage: %.1f\n", total / ((float)(kNUM_BUCKETS)));
}
//#endif