diff --git a/r5dev/filesystem/basefilesystem.cpp b/r5dev/filesystem/basefilesystem.cpp index 762b2ae1..76609417 100644 --- a/r5dev/filesystem/basefilesystem.cpp +++ b/r5dev/filesystem/basefilesystem.cpp @@ -92,7 +92,7 @@ void CBaseFileSystem::Warning(CBaseFileSystem* pFileSystem, FileWarningLevel_t l wconsole->debug(szBuf); #ifndef DEDICATED iconsole->debug(szBuf); - g_pConsole->AddLog(CConLog(g_spd_sys_w_oss.str(), ImVec4(1.00f, 1.00f, 0.00f, 1.00f))); + g_pConsole->AddLog(ConLog_t(g_spd_sys_w_oss.str(), ImVec4(1.00f, 1.00f, 0.00f, 1.00f))); g_spd_sys_w_oss.str(""); g_spd_sys_w_oss.clear(); diff --git a/r5dev/gameui/IConsole.cpp b/r5dev/gameui/IConsole.cpp index 34b16c28..4f0faa2a 100644 --- a/r5dev/gameui/IConsole.cpp +++ b/r5dev/gameui/IConsole.cpp @@ -814,7 +814,7 @@ int CConsole::TextEditCallbackStub(ImGuiInputTextCallbackData* iData) // Purpose: adds logs to the vector // Input : &conLog - //----------------------------------------------------------------------------- -void CConsole::AddLog(const CConLog& conLog) +void CConsole::AddLog(const ConLog_t& conLog) { m_Logger.InsertText(conLog); } @@ -833,7 +833,7 @@ void CConsole::AddLog(const ImVec4& color, const char* fmt, ...) IM_FMTARGS(2) buf[IM_ARRAYSIZE(buf) - 1] = 0; va_end(args); - m_Logger.InsertText(CConLog(Strdup(buf), color)); + m_Logger.InsertText(ConLog_t(Strdup(buf), color)); } //----------------------------------------------------------------------------- diff --git a/r5dev/gameui/IConsole.h b/r5dev/gameui/IConsole.h index b0827a53..87f0a738 100644 --- a/r5dev/gameui/IConsole.h +++ b/r5dev/gameui/IConsole.h @@ -111,7 +111,7 @@ public: static int TextEditCallbackStub(ImGuiInputTextCallbackData* pData); /////////////////////////////////////////////////////////////////////////// - void AddLog(const CConLog& conLog); + void AddLog(const ConLog_t& conLog); void AddLog(const ImVec4& color, const char* fmt, ...) IM_FMTARGS(2); void ClearLog(void); diff --git a/r5dev/squirrel/sqvm.cpp b/r5dev/squirrel/sqvm.cpp index 2c0977ae..0c1e48f8 100644 --- a/r5dev/squirrel/sqvm.cpp +++ b/r5dev/squirrel/sqvm.cpp @@ -174,7 +174,7 @@ SQRESULT SQVM_PrintFunc(HSQUIRRELVM v, SQChar* fmt, ...) } } - g_pConsole->AddLog(CConLog(g_spd_sys_w_oss.str(), color)); + g_pConsole->AddLog(ConLog_t(g_spd_sys_w_oss.str(), color)); g_pLogSystem.AddLog(static_cast(context), g_spd_sys_w_oss.str()); g_spd_sys_w_oss.str(""); @@ -246,7 +246,7 @@ SQRESULT SQVM_WarningFunc(HSQUIRRELVM v, SQInteger a2, SQInteger a3, SQInteger* #ifndef DEDICATED iconsole->debug(vmStr); // Emit to in-game console. - g_pConsole->AddLog(CConLog(g_spd_sys_w_oss.str(), ImVec4(1.00f, 1.00f, 0.00f, 0.80f))); + g_pConsole->AddLog(ConLog_t(g_spd_sys_w_oss.str(), ImVec4(1.00f, 1.00f, 0.00f, 0.80f))); g_pLogSystem.AddLog(LogType_t::WARNING_C, g_spd_sys_w_oss.str()); g_spd_sys_w_oss.str(""); diff --git a/r5dev/thirdparty/imgui/include/imgui_logger.h b/r5dev/thirdparty/imgui/include/imgui_logger.h index 5effd6c9..d60158d2 100644 --- a/r5dev/thirdparty/imgui/include/imgui_logger.h +++ b/r5dev/thirdparty/imgui/include/imgui_logger.h @@ -12,9 +12,9 @@ #include #include "imgui.h" -struct CConLog +struct ConLog_t { - CConLog(const std::string& svConLog, const ImVec4& imColor) + ConLog_t(const std::string& svConLog, const ImVec4& imColor) { m_svConLog = svConLog; m_imColor = imColor; @@ -115,10 +115,10 @@ public: void Render(); void Copy(bool aCopyAll = false); - void SetText(const CConLog& aText); + void SetText(const ConLog_t& aText); std::string GetText() const; - void SetTextLines(const std::vector& aLines); + void SetTextLines(const std::vector& aLines); std::vector GetTextLines() const; ImGuiTextFilter GetFilter() const { return m_itFilter; }; @@ -146,7 +146,7 @@ public: void SetTabSize(int aValue); inline int GetTabSize() const { return m_nTabSize; } - void InsertText(const CConLog& aValue); + void InsertText(const ConLog_t& aValue); void MoveUp(int aAmount = 1, bool aSelect = false); void MoveDown(int aAmount = 1, bool aSelect = false); diff --git a/r5dev/thirdparty/imgui/src/imgui_logger.cpp b/r5dev/thirdparty/imgui/src/imgui_logger.cpp index bfb1e147..a0063f49 100644 --- a/r5dev/thirdparty/imgui/src/imgui_logger.cpp +++ b/r5dev/thirdparty/imgui/src/imgui_logger.cpp @@ -913,7 +913,7 @@ void CTextLogger::Copy(bool aCopyAll) } } -void CTextLogger::SetText(const CConLog& aText) +void CTextLogger::SetText(const ConLog_t& aText) { m_Lines.clear(); m_Lines.emplace_back(Line()); @@ -928,7 +928,7 @@ void CTextLogger::SetText(const CConLog& aText) } } -void CTextLogger::SetTextLines(const std::vector& aLines) +void CTextLogger::SetTextLines(const std::vector& aLines) { m_Lines.clear(); @@ -1045,7 +1045,7 @@ void CTextLogger::SetTabSize(int aValue) m_nTabSize = std::max(0, std::min(32, aValue)); } -void CTextLogger::InsertText(const CConLog & aValue) +void CTextLogger::InsertText(const ConLog_t & aValue) { m_Mutex.lock(); diff --git a/r5dev/tier0/dbg.cpp b/r5dev/tier0/dbg.cpp index c2f31495..163596fd 100644 --- a/r5dev/tier0/dbg.cpp +++ b/r5dev/tier0/dbg.cpp @@ -174,7 +174,7 @@ void DevMsg(eDLL_T context, const char* fmt, ...) break; } - g_pConsole->AddLog(CConLog(g_spd_sys_w_oss.str(), color)); + g_pConsole->AddLog(ConLog_t(g_spd_sys_w_oss.str(), color)); g_pLogSystem.AddLog(tLog, g_spd_sys_w_oss.str()); g_spd_sys_w_oss.str(""); @@ -251,7 +251,7 @@ void Warning(eDLL_T context, const char* fmt, ...) #ifndef DEDICATED iconsole->info(svOut); - g_pConsole->AddLog(CConLog(g_spd_sys_w_oss.str(), ImVec4(1.00f, 1.00f, 0.00f, 0.80f))); + g_pConsole->AddLog(ConLog_t(g_spd_sys_w_oss.str(), ImVec4(1.00f, 1.00f, 0.00f, 0.80f))); g_pLogSystem.AddLog(LogType_t::WARNING_C, g_spd_sys_w_oss.str()); g_spd_sys_w_oss.str(""); @@ -328,7 +328,7 @@ void Error(eDLL_T context, const char* fmt, ...) #ifndef DEDICATED iconsole->info(svOut); - g_pConsole->AddLog(CConLog(g_spd_sys_w_oss.str(), ImVec4(1.00f, 0.00f, 0.00f, 1.00f))); + g_pConsole->AddLog(ConLog_t(g_spd_sys_w_oss.str(), ImVec4(1.00f, 0.00f, 0.00f, 1.00f))); g_pLogSystem.AddLog(LogType_t::ERROR_C, g_spd_sys_w_oss.str()); g_spd_sys_w_oss.str(""); diff --git a/r5dev/vphysics/QHull.cpp b/r5dev/vphysics/QHull.cpp index 33d1a8db..219ec19c 100644 --- a/r5dev/vphysics/QHull.cpp +++ b/r5dev/vphysics/QHull.cpp @@ -32,7 +32,7 @@ int HQHull_PrintFunc(const char* fmt, ...) #ifndef DEDICATED iconsole->debug(buf); - g_pConsole->AddLog(CConLog(g_spd_sys_w_oss.str(), ImVec4(0.81f, 0.81f, 0.81f, 1.00f))); + g_pConsole->AddLog(ConLog_t(g_spd_sys_w_oss.str(), ImVec4(0.81f, 0.81f, 0.81f, 1.00f))); g_spd_sys_w_oss.str(""); g_spd_sys_w_oss.clear();