From 6ff10228ee7c36ecb393af1b0c427568bb79c3df Mon Sep 17 00:00:00 2001 From: Kawe Mazidjatari <48657826+Mauler125@users.noreply.github.com> Date: Tue, 26 Apr 2022 20:35:51 +0200 Subject: [PATCH] Fix incorrect color code Added FCVAR_DEVELOPMENTONLY | FCVAR_HIDDEN and fixed FCVAR_DEVELOPMENTONLY | FCVAR_CLIENTDLL --- r5dev/core/resource.h | 3 ++- r5dev/gameui/IConsole.cpp | 16 +++++++++------- .../png/vf_developmentonly_clientdll.png | Bin 1867 -> 1869 bytes .../png/vf_developmentonly_hidden.png | Bin 0 -> 1867 bytes r5dev/resource/r5dev.rc | 13 +++++++------ 5 files changed, 18 insertions(+), 14 deletions(-) create mode 100644 r5dev/resource/png/vf_developmentonly_hidden.png diff --git a/r5dev/core/resource.h b/r5dev/core/resource.h index f0ea9b40..c31330ba 100644 --- a/r5dev/core/resource.h +++ b/r5dev/core/resource.h @@ -19,6 +19,7 @@ #define IDB_PNG15 115 #define IDB_PNG16 116 #define IDB_PNG17 117 +#define IDB_PNG18 118 #define DEV 256 #define PNG 256 @@ -26,7 +27,7 @@ // #ifdef APSTUDIO_INVOKED #ifndef APSTUDIO_READONLY_SYMBOLS -#define _APS_NEXT_RESOURCE_VALUE 118 +#define _APS_NEXT_RESOURCE_VALUE 119 #define _APS_NEXT_COMMAND_VALUE 40001 #define _APS_NEXT_CONTROL_VALUE 1001 #define _APS_NEXT_SYMED_VALUE 101 diff --git a/r5dev/gameui/IConsole.cpp b/r5dev/gameui/IConsole.cpp index 42dc5edf..c1ffe2d7 100644 --- a/r5dev/gameui/IConsole.cpp +++ b/r5dev/gameui/IConsole.cpp @@ -61,7 +61,7 @@ bool CConsole::Setup(void) SetStyleVar(); int k = 0; // Get all image resources for displaying flags. - for (int i = IDB_PNG3; i <= IDB_PNG17; i++) + for (int i = IDB_PNG3; i <= IDB_PNG18; i++) { m_vFlagIcons.push_back(MODULERESOURCE()); m_vFlagIcons[k] = GetModuleResource(i); @@ -601,18 +601,20 @@ int CConsole::ColorCodeFlags(int nFlags) const return 7; case FCVAR_DEVELOPMENTONLY | FCVAR_CLIENTDLL: return 8; - case FCVAR_DEVELOPMENTONLY | FCVAR_REPLICATED: + case FCVAR_DEVELOPMENTONLY | FCVAR_HIDDEN: return 9; - case FCVAR_DEVELOPMENTONLY | FCVAR_CHEAT: + case FCVAR_DEVELOPMENTONLY | FCVAR_REPLICATED: return 10; - case FCVAR_REPLICATED | FCVAR_CHEAT: + case FCVAR_DEVELOPMENTONLY | FCVAR_CHEAT: return 11; - case FCVAR_REPLICATED | FCVAR_RELEASE: + case FCVAR_REPLICATED | FCVAR_CHEAT: return 12; - case FCVAR_GAMEDLL | FCVAR_CHEAT: + case FCVAR_REPLICATED | FCVAR_RELEASE: return 13; - case FCVAR_CLIENTDLL | FCVAR_CHEAT: + case FCVAR_GAMEDLL | FCVAR_CHEAT: return 14; + case FCVAR_CLIENTDLL | FCVAR_CHEAT: + return 15; default: return 0; } diff --git a/r5dev/resource/png/vf_developmentonly_clientdll.png b/r5dev/resource/png/vf_developmentonly_clientdll.png index fa0f20975a6c1d935c1e1f423f5ec77772fc0421..0f06508633b7d1d74074ebd3f78932bf0e6d643b 100644 GIT binary patch delta 237 zcmX@jcb0F%X(o0f11n<#E0f8Wm{j2Gzf6`YX=!PeX{m;$x<=*}$+`vxCMLR;DTZdc zrlyGoiHYVWW(G-yo1>T~F%hM5vIDCm+;{`F^?9aiGFliI7=k=q978nD_nz9#dq9DQ z)q(%8nZv4zopr085ck_5c6? delta 235 zcmX@hcbad*X(o0<3oBCtE5pf`m{j2Gzf6`Y7Ut$jMkc1Ix+bZHhPsw1CMLR;CI%+D z$tLE>hN-E^NoEF?o1>T~F%hM5vIDCm+;{`F^*Pi2^tv)IFa&tIIEH9U>^*go_kaQq z!-hA+XS!4C7k8}>J^Oq0r&=zzPk!dM$8uKz&1Ud)^>bP0l+XkKS}Ic> diff --git a/r5dev/resource/png/vf_developmentonly_hidden.png b/r5dev/resource/png/vf_developmentonly_hidden.png new file mode 100644 index 0000000000000000000000000000000000000000..fa0f20975a6c1d935c1e1f423f5ec77772fc0421 GIT binary patch literal 1867 zcmb_dONit|7>;`o9d=~Fo2QTgT_4qXRXV9+;xKm4+KpyxW_z9SW_4AiJ5DDRlgxC_ zfCwH0mBk0>#e;|lqM+UucMtB#RTsgN7x%ng1aUoyd$7`vxbDuZ!(u}^mE^1M|Nig) ztLnAR`jd+b4=gB(ve<4lH{|`k^1A1k{D13_^RLR=y=m*YTv2LE<#pHi+``UyT%W?Ty*VGB5*!H#6GN8H@bkv5(xa!pE zfSS-zT~sscHbm$#)iO*^H$2_6fmz4Uz?P-XewvJyu@G-GPt9Vh`-9!lKhNW8;kO+|PB?TFSBwv~{GA^`mw{$;c#{;|*DOQYZ9rhvyM~1wh;92(IWUYVG?1;pNI`A^n;v!yY}Wq;7Ay+) z{u9b54n-CdX;c)GKG)NvKZzCuxSiw$NhohOeN9TOMG?cE>-H?@Z~(b!0>mH$2ujHm zy42*H_UZtDKka8GsN|@u!w5ppwo5iQ41sGw4v^zA;PSBU^+M|OXvOwS z7Re<=hBva7s+eS~hYsl>*9FMtq*Ubr6e0uI#PuL!J&$@^Q~!zE5JQm#f=SQqvY{u9 zgBB%L_v(Ye8C%uFTE!*AKXjx~@wAt(E0H2PgXi7U8a7lWb;!k0@2#XQP z_-bEzdX)as57VEM-P@~&A#@GIO<>t31C&7|orNYaEyF>sWyxAs+25+(#*Tv>Yu=4_ zsD5TH9gw8Y6a_vG7WzyEIWqIz8U^4CkhzhL`MT|D;V!imk6_Gk3% z33&bf)jzJhfBeC(etKy0=MOr+Tsrf{CrPUZjr literal 0 HcmV?d00001 diff --git a/r5dev/resource/r5dev.rc b/r5dev/resource/r5dev.rc index 914b7cff..e8da1274 100644 --- a/r5dev/resource/r5dev.rc +++ b/r5dev/resource/r5dev.rc @@ -64,12 +64,13 @@ 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_cheat.png" -IDB_PNG13 PNG "png\\vf_developmentonly_replicated.png" -IDB_PNG14 PNG "png\\vf_replicated_cheat.png" -IDB_PNG15 PNG "png\\vf_replicated_release.png" -IDB_PNG16 PNG "png\\vf_gamedll_cheat.png" -IDB_PNG17 PNG "png\\vf_clientdll_cheat.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" #endif // English (United States) resources /////////////////////////////////////////////////////////////////////////////