From 577a8760cd1254fc075e5b51a53335790a3ccd5c Mon Sep 17 00:00:00 2001 From: Kawe Mazidjatari <48657826+Mauler125@users.noreply.github.com> Date: Mon, 12 Sep 2022 01:49:51 +0200 Subject: [PATCH] CConsole: add more color coded flags * Added more color coded flags to the console autocomplete window. * Removed 'hidden' as FCVAR_HIDDEN is now enforced on the autocomplete window. * force real-time CommandBase flags (previously compile-time). --- r5dev/core/resource.h | 5 ++++ r5dev/gameui/IConsole.cpp | 26 ++++++++++++------ r5dev/resource/png/vf_clientdll_release.png | Bin 0 -> 1859 bytes ...en.png => vf_developmentonly_msthread.png} | Bin r5dev/resource/png/vf_gamedll_release.png | Bin 0 -> 1860 bytes r5dev/resource/png/vf_msthread.png | Bin 0 -> 1808 bytes r5dev/resource/png/vf_msthread_cheat.png | Bin 0 -> 1859 bytes r5dev/resource/png/vf_msthread_release.png | Bin 0 -> 1857 bytes r5dev/resource/r5dev.rc | 23 ++++++++++------ r5dev/tier1/IConVar.cpp | 2 +- 10 files changed, 38 insertions(+), 18 deletions(-) create mode 100644 r5dev/resource/png/vf_clientdll_release.png rename r5dev/resource/png/{vf_developmentonly_hidden.png => vf_developmentonly_msthread.png} (100%) create mode 100644 r5dev/resource/png/vf_gamedll_release.png create mode 100644 r5dev/resource/png/vf_msthread.png create mode 100644 r5dev/resource/png/vf_msthread_cheat.png create mode 100644 r5dev/resource/png/vf_msthread_release.png diff --git a/r5dev/core/resource.h b/r5dev/core/resource.h index c31330ba..77955810 100644 --- a/r5dev/core/resource.h +++ b/r5dev/core/resource.h @@ -20,6 +20,11 @@ #define IDB_PNG16 116 #define IDB_PNG17 117 #define IDB_PNG18 118 +#define IDB_PNG19 119 +#define IDB_PNG20 120 +#define IDB_PNG21 121 +#define IDB_PNG22 122 +#define IDB_PNG23 123 #define DEV 256 #define PNG 256 diff --git a/r5dev/gameui/IConsole.cpp b/r5dev/gameui/IConsole.cpp index 2f0620b7..ee36bf07 100644 --- a/r5dev/gameui/IConsole.cpp +++ b/r5dev/gameui/IConsole.cpp @@ -666,7 +666,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_PNG18; i++) + for (int i = IDB_PNG3; i <= IDB_PNG23; i++) { m_vFlagIcons.push_back(MODULERESOURCE()); m_vFlagIcons[k] = GetModuleResource(i); @@ -703,24 +703,34 @@ int CConsole::ColorCodeFlags(int nFlags) const return 5; case FCVAR_RELEASE: return 6; - case FCVAR_DEVELOPMENTONLY | FCVAR_GAMEDLL: + case FCVAR_MATERIAL_SYSTEM_THREAD: return 7; - case FCVAR_DEVELOPMENTONLY | FCVAR_CLIENTDLL: + case FCVAR_DEVELOPMENTONLY | FCVAR_GAMEDLL: return 8; - case FCVAR_DEVELOPMENTONLY | FCVAR_HIDDEN: + case FCVAR_DEVELOPMENTONLY | FCVAR_CLIENTDLL: return 9; case FCVAR_DEVELOPMENTONLY | FCVAR_REPLICATED: return 10; case FCVAR_DEVELOPMENTONLY | FCVAR_CHEAT: return 11; - case FCVAR_REPLICATED | FCVAR_CHEAT: + case FCVAR_DEVELOPMENTONLY | FCVAR_MATERIAL_SYSTEM_THREAD: return 12; - case FCVAR_REPLICATED | FCVAR_RELEASE: + case FCVAR_REPLICATED | FCVAR_CHEAT: return 13; - case FCVAR_GAMEDLL | FCVAR_CHEAT: + case FCVAR_REPLICATED | FCVAR_RELEASE: return 14; - case FCVAR_CLIENTDLL | FCVAR_CHEAT: + case FCVAR_GAMEDLL | FCVAR_CHEAT: return 15; + case FCVAR_GAMEDLL | FCVAR_RELEASE: + return 16; + case FCVAR_CLIENTDLL | FCVAR_CHEAT: + return 17; + case FCVAR_CLIENTDLL | FCVAR_RELEASE: + return 18; + case FCVAR_MATERIAL_SYSTEM_THREAD | FCVAR_CHEAT: + return 19; + case FCVAR_MATERIAL_SYSTEM_THREAD | FCVAR_RELEASE: + return 20; default: return 0; } diff --git a/r5dev/resource/png/vf_clientdll_release.png b/r5dev/resource/png/vf_clientdll_release.png new file mode 100644 index 0000000000000000000000000000000000000000..7fbaab74916a733a38fbf64e7b25fb1145e783da GIT binary patch literal 1859 zcmb_dO^6&t6z)h+6I{`Yih?w~2V=CR|EH&lOqR{e>WtXyvKh(hDb-cgGtEwSwcWit zvm;&tiVA`U@hFH08bnX=pa(swV7y2?dJ}RIFXBbw>-lLn$tEtrfu64J{_1=0eebKP zw>H+FT{`~gaYa#Sb4Maamn%eJQf1{}pZ))dU-|*9x7(|^(CeBXQ zdu+1JFxOU2tEa{U2x3uCbsP_qoQ#{=l$XG`e64Hh6jE$Awbe49y5(=EEtv_`t<@1T z9ar^m&8*uF#!su3VK#K5p_?``>%=jLWvTO@2GKGelFjxr^H}iI)CNV75?vpSMzxV$ zlUZLkF~+)K>6V26f%3hipktKe%L|6K$XOPpMI;loWTb)IDViE&Ix8VgE7~NV%LIby zW18w_%_vKn0y(R2=}tDB2Iou{LlKLl$N_6sSWwCLEBJx5aa^JEVr>^Pn%8z9I`8eJ zLf;g*+{u_&+l7eBi^S4_EMz{Ax2U7~Tvd~jRwig6v!0a0MWZ$rENZJ&HU_IF&P55A zqx{J-(0q<)(?T>g%K*6z2U+!=VG-9Mw*3?g3}XiM!3vxfbUzp))9M)}vFgM%t^-RR zg?s-A<&1u@4sDH}ONi z;rCuX^59>SACI2?pF literal 0 HcmV?d00001 diff --git a/r5dev/resource/png/vf_developmentonly_hidden.png b/r5dev/resource/png/vf_developmentonly_msthread.png similarity index 100% rename from r5dev/resource/png/vf_developmentonly_hidden.png rename to r5dev/resource/png/vf_developmentonly_msthread.png diff --git a/r5dev/resource/png/vf_gamedll_release.png b/r5dev/resource/png/vf_gamedll_release.png new file mode 100644 index 0000000000000000000000000000000000000000..ad2d35aeebe7df00ce8c104717a441012eff1c9a GIT binary patch literal 1860 zcmb_dJ!~9B6y8_@fh9+-C}>!%n_!sR|GS$}HrD0N;FDNm*=N~w%+1W+Exz4ZcGteM zixer4kcbEr6a)#mKvblm3*x7M25JgQAc7)Aib%BZ_I?&8ae@_b(%#PQe)GNezW2?{ zyBq7TF3dkauPDkwd#$wz_w&W|%pCk*U%vGY+@4L=-pCZCvQ%8>MxU)5D9Y2vVP`kr z^R_w7Xw@tEnOPv>n$s{G=)R;o4CuwvN_2 z>}Zc+uB}{BFOCQhL?Wl^C>q2W8F|{6m%zAqt!wHSlJ9w1qX?+(`WtFfrb2ZqRm4ok zRcp9nR&594msQI!>$*|bO&gh2;uyrT)ag%yXekfKX6uz{EO_#?ex4^p*N4MlWoTDq z+S5&pv2IwpWg$SI>@d#h2*ugbjG-kmmWD|l%2+KJX;<#&o(7ptN{Et@HqNFpfnfTG zCc0TMiju}a&PrUepAN>sIn%{JL?X^Jz?vl%RPy~2ekyGgmFO&AJ%Eg+wVjI2I){nS zH$^7*QzljqAmY+2v7|3^nf2u(>L@>#)g+{u3YyEbBjsS$sErwm+H4k$!Rm#bFy?ZY zy;uaA&Jit|3s18QklS#ORqYrSaUEjYFTubtCQu)&z-dlTf-y3!j$snhC06}Du;gKI z_@7YDNFdXQf>2>ZdqPj*-Z+}?lXjftG-jgR@-#@b5{8`MZs1r!wTfKEy2urdgRrm} z0^>QhN!`E@=4^gTvi+io#r%n%xn#gmN(bJ=)oNW}Wb>elmj}}z-p$L zvAv##u%zhVBx{is2gYjP(k`ym5Vi$Hm^*cZ18g9h*6I%D-8!oS&%be-av)P*a?so^ z3_Ug$Sqn4h-r;nKY>Bt0qd};Sy+kN0?Cxo-=(FJ3^mTZOPG`$#LObjWAbm{pC$LNg z`H-ff(F0A-;xGMC`DgUt@!30pQ!}tIk!714G45bc)-l0rhKp;KRbysZ{lnSY#C3^l z&D{8e*-yn~eH!-!?4Y{#ran7|@*IPF)zj^f^#)C?} literal 0 HcmV?d00001 diff --git a/r5dev/resource/png/vf_msthread.png b/r5dev/resource/png/vf_msthread.png new file mode 100644 index 0000000000000000000000000000000000000000..6e0758a3a6becbbc1fceeca90d4e4c0e2e5e9165 GIT binary patch literal 1808 zcmb_dzmMER6m}>gh!hGW8Y;`zB#`lMuRWtUr_1iaF2cv@vQmzY@yvMFy0ypHbGLg} zQh?~-PoSWoNJRxmH1uis8)#8FN}hMU<{+1Fidf0(vHi{W-uvD+GhZDZd~o~LJGV4V zyFD3?j^O@gd%gY|{D1xKk6*y;jcWW!qiN<&d)-)lw|k~(H^0rN$Lcuwh%i~0l*?3@ ztD*w5rrqCNRg|3wrKe(+m$C83Prn#?&ST?okl0Bz6!Uz1QHw_x2UB)&!Z0^>AL#d2 z1PBVDsJc`2UK9sf419O0w;|F?(O=sZw7~j)f z+leeYvK$XN1LE7nb@lFNK(v}?lH!3^M9!yAs_@&nsaaiAJ8*OzfXQ#GP$o z)m$ps%;gK}=s)+>RAg8Ss$@Ntap8?Fs< z+dgs!Q`;qhPdx8E7})j(nt&BJRrE3#BgdWE4q%95{{t*}o}K?Elrxgax}YFbUeKAa zs&clDmLz0SHj0)^Oh&N*shWAtNsy&(8l@fzQbth__z{ZyFol$z$alSng(=(4A4zuF zHnE+*@iUhUIC|*__Wj870)hN6%TVb00^uO!C=}TsN;3vQ@Rsf4I)^1i7nfPvtT-?Z zvVf*I3=#GOMVLcYIKwvbXc+mNrxA;Uq5mCsC>OF$BnQpC*3fHXk#XKY_s+W|@<@Ev zjTX7S_7b72wR>!^w$Fka-Rt}covxSBhITm@K>CvAZ(xng)RNX>Zw8uP$6wZq@^9$b z%d_`0KeVxMkn1@dG45kf)_1^bc7Q|I4Vlwd|9tiy2?7$hTQ|O9_MNzFPRp5q9n>;j zy`Jm2_W5pHxw`(>daQQu+*r-}w+q+bF730>&h;zUyxU=aYQRH(?uZhks^L_*8UFSI xoJem^Mtjpc->^TQR$q>PwZB)>yU#wn@pN|b^IOk;f6|^=ll_CylZT&v{ucl+FsA?j literal 0 HcmV?d00001 diff --git a/r5dev/resource/png/vf_msthread_cheat.png b/r5dev/resource/png/vf_msthread_cheat.png new file mode 100644 index 0000000000000000000000000000000000000000..d93aa78d562ca619d0cec66d0a0f8c901ea209d1 GIT binary patch literal 1859 zcmb_d&yU+g7&Wv)uwuC(Bzm#DJ(M5gA7eZAjGAtjWFe{Wvf2i9xl~MM#)-SJ$JpLY zb^#&vfK(&|NL)eUfK*i#oVdUNj;M#85F9ulgg{h1^e;eV>?CHP+p?+}$?@2J^SuWD9EO7>dR~R5g=bH#1B2i05(ihuBQNexRk%aSS}qctww&PG*mMh!mVF;9wIVyzl0RSJR{ejsfe*XX=h-H{p1YC8~} z_jXfmZ17xcXOyq*$cRhx#L}TCL_QREsiXc}SCisa#z`Tvo)DvXqt@pvYO7T?2B{~` zMF|t*{FyS)Yz}Xef;Tm2O1Vu3z(&u6*mbaNKPLyKIfVw&3XBwFKNtZE_Dl=g4GgV+ zfdz}g-T#F$ibIjbL<$wfWWbFy8C21N0C$tTAPME&c2kq7>QTh74Qf{U>fqj6@a) zCN;N9Ls!PaohX;x+np_uv;2+OXcVcHmoTBF-J2RM`^=d(dmSC1)8R6j(vF8*lHQ~F zQ&=v-VoWl=GLV`c#$U$W^3Tc6y|Z^h$1@SP0JJRzD07fh*0H45Oc!|&deo|`zcYIq zyDoO&+>Q5{{Y+dsB*}ow9n{e7zn;Un_Rek`xVj!_Jw~~APOWDA*M-%$efz9zXZ1>M z-sP}9HRMBm?(jrPmB~}(_nW`{EKj6Px4qIk@zML&x{HeX_|fkce!cY0>gMSqAD{Nm zd=UJBez>e&xOVi^eH*&-@I~rZSj{Y-yeJOt*b|F XeRBM~cI;2BJm$KqYwa&yc>UtvrCv$O literal 0 HcmV?d00001 diff --git a/r5dev/resource/png/vf_msthread_release.png b/r5dev/resource/png/vf_msthread_release.png new file mode 100644 index 0000000000000000000000000000000000000000..d0c00980dfc26e22ebd9156b0d29261657e1f581 GIT binary patch literal 1857 zcmb_dO>f*p7SOZC6o~){E3rIHMrnbjzEa0UVqCpe6}g6#d%m((C6srAZMnm9CfjWX z5Z$t67q)fBv><#`HZJUOzGgQL>0s)GHw8T@87Oh2uE-OeLXJyP&xr&HGJ}!MlFrAfQpn^|n@(R0An#aM?H?)yXMQ*@z`9EenCw8>~<%2pagYVUwgm7v=iCU^K7oSai`p z$e6mr3O>#WTi+KMTMJ^@ke9p|@|)Drd~T}AP$y@&6wodk6C+a)G@#AB|$U_7cLRvb(R4s?Urn^VjilI-Q8oEbL^+M9^C_e+Daf zR8DZt)&@e;llV)$8UF(B-ThIkB3ro8 zSh(>v+0Vr#L!1tn*g;k0_Uk#BYj5nvv8(HUtw*i)&Y9KJf4i{$c4VIw?W|vk&AS>l zr-pcF&K;Htsd90u+*v+*R-8y1z3y6n`JK1E{pO4$pS|nz??d0&TmAk0Q(v{Ne!23- z>G8d3ns__13q#mmh!rwZ8#8hexUa literal 0 HcmV?d00001 diff --git a/r5dev/resource/r5dev.rc b/r5dev/resource/r5dev.rc index e8da1274..a7ff9d9c 100644 --- a/r5dev/resource/r5dev.rc +++ b/r5dev/resource/r5dev.rc @@ -62,15 +62,20 @@ 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_developmentonly_gamedll.png" -IDB_PNG11 PNG "png\\vf_developmentonly_clientdll.png" -IDB_PNG12 PNG "png\\vf_developmentonly_hidden.png" -IDB_PNG13 PNG "png\\vf_developmentonly_cheat.png" -IDB_PNG14 PNG "png\\vf_developmentonly_replicated.png" -IDB_PNG15 PNG "png\\vf_replicated_cheat.png" -IDB_PNG16 PNG "png\\vf_replicated_release.png" -IDB_PNG17 PNG "png\\vf_gamedll_cheat.png" -IDB_PNG18 PNG "png\\vf_clientdll_cheat.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" #endif // English (United States) resources ///////////////////////////////////////////////////////////////////////////// diff --git a/r5dev/tier1/IConVar.cpp b/r5dev/tier1/IConVar.cpp index 31566cba..7300dd71 100644 --- a/r5dev/tier1/IConVar.cpp +++ b/r5dev/tier1/IConVar.cpp @@ -176,7 +176,7 @@ void ConVar::Init(void) const con_suggestion_limit = ConVar::Create("con_suggestion_limit" , "128" , FCVAR_DEVELOPMENTONLY, "Maximum number of suggestions the autocomplete window will show for the console.", true, 0.f, false, 0.f, nullptr, nullptr); con_suggestion_showhelptext = ConVar::Create("con_suggestion_showhelptext" , "1" , FCVAR_DEVELOPMENTONLY, "Show CommandBase help text in autocomplete window.", false, 0.f, false, 0.f, nullptr, nullptr); con_suggestion_showflags = ConVar::Create("con_suggestion_showflags" , "1" , FCVAR_DEVELOPMENTONLY, "Show CommandBase flags in autocomplete window.", false, 0.f, false, 0.f, nullptr, nullptr); - con_suggestion_flags_realtime = ConVar::Create("con_suggestion_flags_realtime" , "0" , FCVAR_DEVELOPMENTONLY, "Whether to show compile-time or run-time CommandBase flags.", false, 0.f, false, 0.f, nullptr, nullptr); + con_suggestion_flags_realtime = ConVar::Create("con_suggestion_flags_realtime" , "1" , FCVAR_DEVELOPMENTONLY, "Whether to show compile-time or run-time CommandBase flags.", false, 0.f, false, 0.f, nullptr, nullptr); #endif // !DEDICATED //------------------------------------------------------------------------- // FILESYSTEM |