From dac63ee5ef0bb10a1b0bf1da0d098f1e425e77d8 Mon Sep 17 00:00:00 2001 From: Kawe Mazidjatari <48657826+Mauler125@users.noreply.github.com> Date: Tue, 11 Oct 2022 01:22:21 +0200 Subject: [PATCH] Add FCVAR_REPLICATED console flag icon --- r5dev/core/resource.h | 1 + r5dev/gameui/IConsole.cpp | 40 ++++++++++++++------------- r5dev/resource/png/vf_replicated.png | Bin 0 -> 1808 bytes r5dev/resource/r5dev.rc | 33 +++++++++++----------- 4 files changed, 39 insertions(+), 35 deletions(-) create mode 100644 r5dev/resource/png/vf_replicated.png diff --git a/r5dev/core/resource.h b/r5dev/core/resource.h index 77955810..1e21eb5a 100644 --- a/r5dev/core/resource.h +++ b/r5dev/core/resource.h @@ -25,6 +25,7 @@ #define IDB_PNG21 121 #define IDB_PNG22 122 #define IDB_PNG23 123 +#define IDB_PNG24 124 #define DEV 256 #define PNG 256 diff --git a/r5dev/gameui/IConsole.cpp b/r5dev/gameui/IConsole.cpp index 15f4c8a8..8ad01a3a 100644 --- a/r5dev/gameui/IConsole.cpp +++ b/r5dev/gameui/IConsole.cpp @@ -462,7 +462,7 @@ void CConsole::FindFromPartial(void) m_vsvCommandBases[i].m_svName) == m_vSuggest.end()) { string svValue; int nFlags = FCVAR_NONE; - ConCommandBase* pCommandBase = g_pCVar->FindCommandBase(m_vsvCommandBases[i].m_svName.c_str()); + const ConCommandBase* pCommandBase = g_pCVar->FindCommandBase(m_vsvCommandBases[i].m_svName.c_str()); if (!pCommandBase || pCommandBase->IsFlagSet(FCVAR_HIDDEN)) { @@ -471,7 +471,7 @@ void CConsole::FindFromPartial(void) if (!pCommandBase->IsCommand()) { - ConVar* pConVar = reinterpret_cast(pCommandBase); + const ConVar* pConVar = reinterpret_cast(pCommandBase); svValue = " = ["; // Assign default value to string if its a ConVar. svValue.append(pConVar->GetString()); @@ -669,7 +669,7 @@ void CConsole::ClampHistorySize(void) bool CConsole::LoadFlagIcons(void) { int k = 0; // Get all image resources for displaying flags. - for (int i = IDB_PNG3; i <= IDB_PNG23; i++) + for (int i = IDB_PNG3; i <= IDB_PNG24; i++) { m_vFlagIcons.push_back(MODULERESOURCE()); m_vFlagIcons[k] = GetModuleResource(i); @@ -702,38 +702,40 @@ int CConsole::ColorCodeFlags(int nFlags) const return 3; case FCVAR_CLIENTDLL: return 4; - case FCVAR_CHEAT: + case FCVAR_REPLICATED: return 5; - case FCVAR_RELEASE: + case FCVAR_CHEAT: return 6; - case FCVAR_MATERIAL_SYSTEM_THREAD: + case FCVAR_RELEASE: return 7; - case FCVAR_DEVELOPMENTONLY | FCVAR_GAMEDLL: + case FCVAR_MATERIAL_SYSTEM_THREAD: return 8; - case FCVAR_DEVELOPMENTONLY | FCVAR_CLIENTDLL: + case FCVAR_DEVELOPMENTONLY | FCVAR_GAMEDLL: return 9; - case FCVAR_DEVELOPMENTONLY | FCVAR_REPLICATED: + case FCVAR_DEVELOPMENTONLY | FCVAR_CLIENTDLL: return 10; - case FCVAR_DEVELOPMENTONLY | FCVAR_CHEAT: + case FCVAR_DEVELOPMENTONLY | FCVAR_REPLICATED: return 11; - case FCVAR_DEVELOPMENTONLY | FCVAR_MATERIAL_SYSTEM_THREAD: + case FCVAR_DEVELOPMENTONLY | FCVAR_CHEAT: return 12; - case FCVAR_REPLICATED | FCVAR_CHEAT: + case FCVAR_DEVELOPMENTONLY | FCVAR_MATERIAL_SYSTEM_THREAD: return 13; - case FCVAR_REPLICATED | FCVAR_RELEASE: + case FCVAR_REPLICATED | FCVAR_CHEAT: return 14; - case FCVAR_GAMEDLL | FCVAR_CHEAT: + case FCVAR_REPLICATED | FCVAR_RELEASE: return 15; - case FCVAR_GAMEDLL | FCVAR_RELEASE: + case FCVAR_GAMEDLL | FCVAR_CHEAT: return 16; - case FCVAR_CLIENTDLL | FCVAR_CHEAT: + case FCVAR_GAMEDLL | FCVAR_RELEASE: return 17; - case FCVAR_CLIENTDLL | FCVAR_RELEASE: + case FCVAR_CLIENTDLL | FCVAR_CHEAT: return 18; - case FCVAR_MATERIAL_SYSTEM_THREAD | FCVAR_CHEAT: + case FCVAR_CLIENTDLL | FCVAR_RELEASE: return 19; - case FCVAR_MATERIAL_SYSTEM_THREAD | FCVAR_RELEASE: + case FCVAR_MATERIAL_SYSTEM_THREAD | FCVAR_CHEAT: return 20; + case FCVAR_MATERIAL_SYSTEM_THREAD | FCVAR_RELEASE: + return 21; default: return 0; } diff --git a/r5dev/resource/png/vf_replicated.png b/r5dev/resource/png/vf_replicated.png new file mode 100644 index 0000000000000000000000000000000000000000..88d6e5125b28663734e6df8227525bfc8d953323 GIT binary patch literal 1808 zcmb_dO^@3|7>NrjiyHd2=xlbLa1ZR~Mv?ndg1q=Y3}8$>G7Lw{E_7Q`59t zlkw;X?r%5Oo3FwDcOU%p4cy);#$QyLX6`iCjrG&rGfjKr`*eC-AIG0jt}>GeHIwE# zD*&x&_jlI?<0rD#XL6qAk@4HlzZiNdBIA)CRjt>G#(Z z2r^kSeVr}yimoH0<)tugUR#FVLh6&q*lPmn$MK;)RHf8?GeF$-e0@MnJ8(ThKGYp- zhZYVk+eLOjJxm=(?|ueED@8(&MxS)C;3+Z|bzM-)TCG;*$~9Fvw`@X)g&oUr5Fk)> zp4V)R@@i+xFp?E7)1ppQt~ZQqrcUd~fJ`?fWJOP#SDj2Cn6+kwWt+GusRat&)#oo!;p zLe;8Ts29}Hf9|U(=&+QmR^?Qw<+f3WTNZsdY#KxKJCD*_s8w~h3DnJzBUa1Ea4^V? zJ>&#a>`>pMu6qv#7;m64SV6FwT>{$}+4dA;>iX0T{{dDaP0s%lDmYD4nK2M5&DdO8 zMLut%#W9`aRn2lPC!@%KRLwLMRB-O&S-_DO5C?hKb5Ix%7dasx*o1LENjBNS{E_0P zO%t2>8$S!hfuolWyh(x}lmxjVnIZ0a9%9MNLq1NhC!7R0Df#>hIL$y?8tORK8HimAEMaO9c-8=7=$V2(K z8!c14^%7;gv3q3jrq5Cs-RtxUovxSBhIX}(K>CvAZ(x;5>J=;H-W)W&j=!uIeDc-!S@=Uez5Dxv8~0v+KYI6_XHT0mYqEbZ`tjp0zy1qh94)f| literal 0 HcmV?d00001 diff --git a/r5dev/resource/r5dev.rc b/r5dev/resource/r5dev.rc index a7ff9d9c..5bed4e7b 100644 --- a/r5dev/resource/r5dev.rc +++ b/r5dev/resource/r5dev.rc @@ -60,22 +60,23 @@ IDB_PNG4 PNG "png\\vf_none.png" IDB_PNG5 PNG "png\\vf_developmentonly.png" IDB_PNG6 PNG "png\\vf_gamedll.png" IDB_PNG7 PNG "png\\vf_clientdll.png" -IDB_PNG8 PNG "png\\vf_cheat.png" -IDB_PNG9 PNG "png\\vf_release.png" -IDB_PNG10 PNG "png\\vf_msthread.png" -IDB_PNG11 PNG "png\\vf_developmentonly_gamedll.png" -IDB_PNG12 PNG "png\\vf_developmentonly_clientdll.png" -IDB_PNG13 PNG "png\\vf_developmentonly_replicated.png" -IDB_PNG14 PNG "png\\vf_developmentonly_cheat.png" -IDB_PNG15 PNG "png\\vf_developmentonly_msthread.png" -IDB_PNG16 PNG "png\\vf_replicated_cheat.png" -IDB_PNG17 PNG "png\\vf_replicated_release.png" -IDB_PNG18 PNG "png\\vf_gamedll_cheat.png" -IDB_PNG19 PNG "png\\vf_gamedll_release.png" -IDB_PNG20 PNG "png\\vf_clientdll_cheat.png" -IDB_PNG21 PNG "png\\vf_clientdll_release.png" -IDB_PNG22 PNG "png\\vf_msthread_cheat.png" -IDB_PNG23 PNG "png\\vf_msthread_release.png" +IDB_PNG8 PNG "png\\vf_replicated.png" +IDB_PNG9 PNG "png\\vf_cheat.png" +IDB_PNG10 PNG "png\\vf_release.png" +IDB_PNG11 PNG "png\\vf_msthread.png" +IDB_PNG12 PNG "png\\vf_developmentonly_gamedll.png" +IDB_PNG13 PNG "png\\vf_developmentonly_clientdll.png" +IDB_PNG14 PNG "png\\vf_developmentonly_replicated.png" +IDB_PNG15 PNG "png\\vf_developmentonly_cheat.png" +IDB_PNG16 PNG "png\\vf_developmentonly_msthread.png" +IDB_PNG17 PNG "png\\vf_replicated_cheat.png" +IDB_PNG18 PNG "png\\vf_replicated_release.png" +IDB_PNG19 PNG "png\\vf_gamedll_cheat.png" +IDB_PNG20 PNG "png\\vf_gamedll_release.png" +IDB_PNG21 PNG "png\\vf_clientdll_cheat.png" +IDB_PNG22 PNG "png\\vf_clientdll_release.png" +IDB_PNG23 PNG "png\\vf_msthread_cheat.png" +IDB_PNG24 PNG "png\\vf_msthread_release.png" #endif // English (United States) resources /////////////////////////////////////////////////////////////////////////////