From 16ea75d5a24e97bf5257af6a97a965d13020bc4e Mon Sep 17 00:00:00 2001 From: Kawe Mazidjatari <48657826+Mauler125@users.noreply.github.com> Date: Sat, 1 Apr 2023 13:10:22 +0200 Subject: [PATCH] Fix clang-cl compile errors Cannot concatenate __FUNCTION__ macro like this. --- r5dev/materialsystem/cmaterialsystem.cpp | 4 ++-- r5dev/vstdlib/callback.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/r5dev/materialsystem/cmaterialsystem.cpp b/r5dev/materialsystem/cmaterialsystem.cpp index d1a9144e..11d91b96 100644 --- a/r5dev/materialsystem/cmaterialsystem.cpp +++ b/r5dev/materialsystem/cmaterialsystem.cpp @@ -30,14 +30,14 @@ void StreamDB_Init(const char* pszLevelName) if (pStreamKV) { const char* pszColumnName = pStreamKV->GetString(); - DevMsg(eDLL_T::MS, __FUNCTION__": Loading override STBSP file '%s.stbsp'\n", pszColumnName); + DevMsg(eDLL_T::MS, "StreamDB_Init: Loading override STBSP file '%s.stbsp'\n", pszColumnName); v_StreamDB_Init(pszColumnName); return; } } - DevMsg(eDLL_T::MS, __FUNCTION__": Loading STBSP file '%s.stbsp'\n", pszLevelName); + DevMsg(eDLL_T::MS, "StreamDB_Init: Loading STBSP file '%s.stbsp'\n", pszLevelName); v_StreamDB_Init(pszLevelName); } diff --git a/r5dev/vstdlib/callback.cpp b/r5dev/vstdlib/callback.cpp index 67628bc9..d466dff4 100644 --- a/r5dev/vstdlib/callback.cpp +++ b/r5dev/vstdlib/callback.cpp @@ -1057,7 +1057,7 @@ void Mat_CrossHair_f(const CCommand& args) } else { - DevMsg(eDLL_T::MS, __FUNCTION__": No material found >:(\n"); + DevMsg(eDLL_T::MS, "%s: No material found >:(\n", __FUNCTION__); } }