From ca0172ed1f4d8e4c59c7b347c1193d457292a034 Mon Sep 17 00:00:00 2001
From: Kawe Mazidjatari <48657826+Mauler125@users.noreply.github.com>
Date: Mon, 22 Aug 2022 21:15:46 +0200
Subject: [PATCH] Add cvar for RTech debugging and removed dev flag from
 'launchplaylist'

---
 r5dev/rtech/rtech_utils.cpp | 4 +++-
 r5dev/tier1/IConVar.cpp     | 1 +
 r5dev/tier1/cmd.cpp         | 5 +++--
 r5dev/tier1/cvar.cpp        | 1 +
 r5dev/tier1/cvar.h          | 1 +
 5 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/r5dev/rtech/rtech_utils.cpp b/r5dev/rtech/rtech_utils.cpp
index 7b4fdb4c..1072711a 100644
--- a/r5dev/rtech/rtech_utils.cpp
+++ b/r5dev/rtech/rtech_utils.cpp
@@ -1,4 +1,5 @@
 #include "core/stdafx.h"
+#include "tier1/cvar.h"
 #include "rtech/rtech_utils.h"
 #ifndef DEDICATED
 #include "windows/id3dx.h"
@@ -637,7 +638,8 @@ int32_t RTech::OpenFile(const CHAR* szFilePath, void* unused, LONGLONG* fileSize
 	if (hFile == INVALID_HANDLE_VALUE)
 		return -1;
 
-	DevMsg(eDLL_T::RTECH, "Opened file: '%s'\n", svModFile.c_str());
+	if (rtech_debug->GetBool())
+		DevMsg(eDLL_T::RTECH, "Opened file: '%s'\n", svModFile.c_str());
 
 	if (fileSizeOut)
 	{
diff --git a/r5dev/tier1/IConVar.cpp b/r5dev/tier1/IConVar.cpp
index 738042e0..5130a305 100644
--- a/r5dev/tier1/IConVar.cpp
+++ b/r5dev/tier1/IConVar.cpp
@@ -203,6 +203,7 @@ void ConVar::Init(void) const
 	pylon_showdebug            = ConVar::Create("pylon_showdebug"           , "0"                        , FCVAR_DEVELOPMENTONLY, "Shows debug output for pylon.", false, 0.f, false, 0.f, nullptr, nullptr);
 	//-------------------------------------------------------------------------
 	// RTECH API                                                              |
+	rtech_debug = ConVar::Create("rtech_debug", "0", FCVAR_DEVELOPMENTONLY, "Shows debug output for the RTech system.", false, 0.f, false, 0.f, nullptr, nullptr);
 	//-------------------------------------------------------------------------
 	// RUI                                                                    |
 #ifndef DEDICATED
diff --git a/r5dev/tier1/cmd.cpp b/r5dev/tier1/cmd.cpp
index 4493695d..81619033 100644
--- a/r5dev/tier1/cmd.cpp
+++ b/r5dev/tier1/cmd.cpp
@@ -407,14 +407,15 @@ void ConCommand::InitShipped(void)
 			"connect",
 			"connectAsSpectator",
 			"connectWithKey",
-			"set",
 			"silentconnect",
+			"set",
 			"ping",
 #endif // !DEDICATED
-			"exit",
 			"map",
 			"map_background",
+			"launchplaylist",
 			"quit",
+			"exit",
 			"restart",
 			"status",
 			"version",
diff --git a/r5dev/tier1/cvar.cpp b/r5dev/tier1/cvar.cpp
index 442c01b5..b90b6baf 100644
--- a/r5dev/tier1/cvar.cpp
+++ b/r5dev/tier1/cvar.cpp
@@ -169,6 +169,7 @@ ConVar* pylon_matchmaking_hostname         = nullptr;
 ConVar* pylon_showdebug                    = nullptr;
 //-----------------------------------------------------------------------------
 // RTECH API                                                                  |
+ConVar* rtech_debug                        = nullptr;
 //-----------------------------------------------------------------------------
 // RUI                                                                        |
 #ifndef DEDICATED
diff --git a/r5dev/tier1/cvar.h b/r5dev/tier1/cvar.h
index fb3a2ed7..739d0afb 100644
--- a/r5dev/tier1/cvar.h
+++ b/r5dev/tier1/cvar.h
@@ -164,6 +164,7 @@ extern ConVar* pylon_matchmaking_hostname;
 extern ConVar* pylon_showdebug;
 //-------------------------------------------------------------------------
 // RTECH API                                                              |
+extern ConVar* rtech_debug;
 //-------------------------------------------------------------------------
 // RUI                                                                    |
 #ifndef DEDICATED