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

Rename variable 'g_pIConsole' to 'g_pConsole'

Browse Source
This commit is contained in:
Kawe Mazidjatari 2022-05-27 02:46:13 +02:00
parent 58d46c0a8c
commit e6ef3d71f1
11 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
r5dev/client/cdll_engine_int.cpp
View File

@ -38,7 +38,7 @@ void CHLClient::FrameStageNotify(CHLClient* pHLClient, ClientFrameStage_t frameS
break;
}
}
g_pIConsole->Think();
g_pConsole->Think();
CHLClient_FrameStageNotify(pHLClient, frameStage);
}

2
r5dev/filesystem/basefilesystem.cpp
View File

@ -91,7 +91,7 @@ void CBaseFileSystem::Warning(CBaseFileSystem* pFileSystem, FileWarningLevel_t l
wconsole->debug(szBuf);
#ifndef DEDICATED
iconsole->debug(szBuf);
g_pIConsole->m_ivConLog.push_back(CConLog(g_spd_sys_w_oss.str(), ImVec4(1.00f, 1.00f, 0.00f, 1.00f)));
g_pConsole->m_ivConLog.push_back(CConLog(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();

2
r5dev/gameui/IConsole.cpp
View File

@ -913,4 +913,4 @@ void CConsole::SetStyleVar(void)
style.WindowMinSize = ImVec2(618, 518);
}
CConsole* g_pIConsole = new CConsole();
CConsole* g_pConsole = new CConsole();

2
r5dev/gameui/IConsole.h
View File

@ -117,5 +117,5 @@ public:
};
///////////////////////////////////////////////////////////////////////////////
extern CConsole* g_pIConsole;
extern CConsole* g_pConsole;
#endif // !DEDICATED

2
r5dev/launcher/IApplication.cpp
View File

@ -62,7 +62,7 @@ bool CModAppSystemGroup::Create(CModAppSystemGroup* pModAppSystemGroup)
#ifndef DEDICATED
for (auto& map : g_pCVar->DumpToMap())
{
g_pIConsole->m_vsvCommandBases.push_back(
g_pConsole->m_vsvCommandBases.push_back(
CSuggest(map.first.c_str(), map.second->GetFlags()));
}
#endif // !DEDICATED

4
r5dev/squirrel/sqvm.cpp
View File

@ -162,7 +162,7 @@ SQRESULT SQVM_PrintFunc(HSQUIRRELVM v, SQChar* fmt, ...)
}
}
g_pIConsole->m_ivConLog.push_back(CConLog(PrintPercentageEscape(g_spd_sys_w_oss.str()), color));
g_pConsole->m_ivConLog.push_back(CConLog(PrintPercentageEscape(g_spd_sys_w_oss.str()), color));
g_pLogSystem.AddLog(static_cast<LogType_t>(context), g_spd_sys_w_oss.str());
g_spd_sys_w_oss.str("");
@ -232,7 +232,7 @@ SQRESULT SQVM_WarningFunc(HSQUIRRELVM v, SQInteger a2, SQInteger a3, SQInteger*
#ifndef DEDICATED
iconsole->debug(vmStr); // Emit to in-game console.
g_pIConsole->m_ivConLog.push_back(CConLog(PrintPercentageEscape(g_spd_sys_w_oss.str()), ImVec4(1.00f, 1.00f, 0.00f, 0.80f)));
g_pConsole->m_ivConLog.push_back(CConLog(PrintPercentageEscape(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("");

2
r5dev/thirdparty/imgui/src/imgui_impl_win32.cpp vendored
View File

@ -186,7 +186,7 @@ void ImGui_ImplWin32_Shutdown()
static bool ImGui_ImplWin32_UpdateMouseCursor()
{
// These have to be here to prevent the mouse in-game from flickering when '::SetCursor(...)' is called.
if (g_pBrowser->m_bActivate || g_pIConsole->m_bActivate)
if (g_pBrowser->m_bActivate || g_pConsole->m_bActivate)
{
ImGuiIO& io = ImGui::GetIO();
if (io.ConfigFlags & ImGuiConfigFlags_NoMouseCursorChange)

6
r5dev/tier0/dbg.cpp
View File

@ -174,7 +174,7 @@ void DevMsg(eDLL_T context, const char* fmt, ...)
break;
}
g_pIConsole->m_ivConLog.push_back(CConLog(PrintPercentageEscape(g_spd_sys_w_oss.str()), color));
g_pConsole->m_ivConLog.push_back(CConLog(PrintPercentageEscape(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_pIConsole->m_ivConLog.push_back(CConLog(PrintPercentageEscape(g_spd_sys_w_oss.str()), ImVec4(1.00f, 1.00f, 0.00f, 0.80f)));
g_pConsole->m_ivConLog.push_back(CConLog(PrintPercentageEscape(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_pIConsole->m_ivConLog.push_back(CConLog(PrintPercentageEscape(g_spd_sys_w_oss.str()), ImVec4(1.00f, 0.00f, 0.00f, 1.00f)));
g_pConsole->m_ivConLog.push_back(CConLog(PrintPercentageEscape(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("");

2
r5dev/vphysics/QHull.cpp
View File

@ -32,7 +32,7 @@ int HQHull_PrintFunc(const char* fmt, ...)
#ifndef DEDICATED
iconsole->debug(buf);
g_pIConsole->m_ivConLog.push_back(CConLog(g_spd_sys_w_oss.str(), ImVec4(0.81f, 0.81f, 0.81f, 1.00f)));
g_pConsole->m_ivConLog.push_back(CConLog(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();

2
r5dev/vstdlib/callback.cpp
View File

@ -50,7 +50,7 @@ GameConsole_Invoke_f
*/
void GameConsole_Invoke_f(const CCommand& args)
{
g_pIConsole->m_bActivate = !g_pIConsole->m_bActivate;
g_pConsole->m_bActivate = !g_pConsole->m_bActivate;
}
/*

12
r5dev/windows/id3dx.cpp
View File

@ -68,7 +68,7 @@ LRESULT CALLBACK HwndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
{
if (wParam == g_pImGuiConfig->IConsole_Config.m_nBind0 || wParam == g_pImGuiConfig->IConsole_Config.m_nBind1)
{
g_pIConsole->m_bActivate = !g_pIConsole->m_bActivate;
g_pConsole->m_bActivate = !g_pConsole->m_bActivate;
}
if (wParam == g_pImGuiConfig->IBrowser_Config.m_nBind0 || wParam == g_pImGuiConfig->IBrowser_Config.m_nBind1)
@ -77,7 +77,7 @@ LRESULT CALLBACK HwndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
}
}
if (g_pIConsole->m_bActivate || g_pBrowser->m_bActivate)
if (g_pConsole->m_bActivate || g_pBrowser->m_bActivate)
{//////////////////////////////////////////////////////////////////////////////
g_bBlockInput = true;
@ -278,12 +278,12 @@ void DrawImGui()
g_pInputSystem->EnableInput(false); // Disable input to game when browser is drawn.
g_pBrowser->Draw("Server Browser", &g_pBrowser->m_bActivate);
}
if (g_pIConsole->m_bActivate)
if (g_pConsole->m_bActivate)
{
g_pInputSystem->EnableInput(false); // Disable input to game when console is drawn.
g_pIConsole->Draw("Console", &g_pIConsole->m_bActivate);
g_pConsole->Draw("Console", &g_pConsole->m_bActivate);
}
if (!g_pIConsole->m_bActivate && !g_pBrowser->m_bActivate)
if (!g_pConsole->m_bActivate && !g_pBrowser->m_bActivate)
{
g_pInputSystem->EnableInput(true); // Enable input to game when both are not drawn.
}
@ -369,7 +369,7 @@ HRESULT GetDeviceAndCtxFromSwapchain(IDXGISwapChain* pSwapChain, ID3D11Device**
HRESULT __stdcall GetResizeBuffers(IDXGISwapChain* pSwapChain, UINT nBufferCount, UINT nWidth, UINT nHeight, DXGI_FORMAT dxFormat, UINT nSwapChainFlags)
{
g_pIConsole->m_bActivate = false;
g_pConsole->m_bActivate = false;
g_pBrowser->m_bActivate = false;
g_bInitialized = false;
g_bPresentHooked = false;