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 00000000..7fbaab74 Binary files /dev/null and b/r5dev/resource/png/vf_clientdll_release.png differ 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 00000000..ad2d35ae Binary files /dev/null and b/r5dev/resource/png/vf_gamedll_release.png differ diff --git a/r5dev/resource/png/vf_msthread.png b/r5dev/resource/png/vf_msthread.png new file mode 100644 index 00000000..6e0758a3 Binary files /dev/null and b/r5dev/resource/png/vf_msthread.png differ diff --git a/r5dev/resource/png/vf_msthread_cheat.png b/r5dev/resource/png/vf_msthread_cheat.png new file mode 100644 index 00000000..d93aa78d Binary files /dev/null and b/r5dev/resource/png/vf_msthread_cheat.png differ diff --git a/r5dev/resource/png/vf_msthread_release.png b/r5dev/resource/png/vf_msthread_release.png new file mode 100644 index 00000000..d0c00980 Binary files /dev/null and b/r5dev/resource/png/vf_msthread_release.png differ 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 |