From d555c39434f14e8f187ab5aaa4b015f3082055d5 Mon Sep 17 00:00:00 2001
From: Amos <48657826+Mauler125@users.noreply.github.com>
Date: Sun, 6 Feb 2022 17:06:22 +0100
Subject: [PATCH] Rename to 'cmd'

---
 r5dev/core/assert.h                     | 4 ++--
 r5dev/core/init.cpp                     | 2 +-
 r5dev/dedicated.vcxproj                 | 4 ++--
 r5dev/dedicated.vcxproj.filters         | 4 ++--
 r5dev/engine/cl_rcon.cpp                | 3 ++-
 r5dev/engine/sv_rcon.cpp                | 2 +-
 r5dev/r5dev.vcxproj                     | 4 ++--
 r5dev/r5dev.vcxproj.filters             | 4 ++--
 r5dev/tier0/IConVar.h                   | 2 +-
 r5dev/tier0/{ConCommand.cpp => cmd.cpp} | 2 +-
 r5dev/tier0/{ConCommand.h => cmd.h}     | 0
 11 files changed, 16 insertions(+), 15 deletions(-)
 rename r5dev/tier0/{ConCommand.cpp => cmd.cpp} (99%)
 rename r5dev/tier0/{ConCommand.h => cmd.h} (100%)

diff --git a/r5dev/core/assert.h b/r5dev/core/assert.h
index dd44c5d2..8b27e2b5 100644
--- a/r5dev/core/assert.h
+++ b/r5dev/core/assert.h
@@ -3,9 +3,9 @@
 #   define Assert(condition, message) \
     do { \
         if (! (condition)) { \
-            std::cerr << "Assertion `" #condition "` failed in " << __FILE__ \
+            std::cerr << "Assertion '" #condition "' failed in " << __FILE__ \
                       << " line " << __LINE__ << ": " << message << std::endl; \
-            std::terminate(); \
+            assert(condition); \
         } \
     } while (false)
 #else
diff --git a/r5dev/core/init.cpp b/r5dev/core/init.cpp
index 43f9f511..09f2d854 100644
--- a/r5dev/core/init.cpp
+++ b/r5dev/core/init.cpp
@@ -7,8 +7,8 @@
 #include "core/stdafx.h"
 #include "core/init.h"
 #include "tier0/commandline.h"
-#include "tier0/ConCommand.h"
 #include "tier0/completion.h"
+#include "tier0/cmd.h"
 #include "tier0/cvar.h"
 #include "tier0/IConVar.h"
 #include "vpc/IAppSystem.h"
diff --git a/r5dev/dedicated.vcxproj b/r5dev/dedicated.vcxproj
index b28f8f68..b507483a 100644
--- a/r5dev/dedicated.vcxproj
+++ b/r5dev/dedicated.vcxproj
@@ -350,7 +350,7 @@
     <ClInclude Include="thirdparty\spdlog\include\version.h" />
     <ClInclude Include="tier0\basetypes.h" />
     <ClInclude Include="tier0\commandline.h" />
-    <ClInclude Include="tier0\ConCommand.h" />
+    <ClInclude Include="tier0\cmd.h" />
     <ClInclude Include="tier0\completion.h" />
     <ClInclude Include="tier0\cvar.h" />
     <ClInclude Include="tier0\IConVar.h" />
@@ -506,7 +506,7 @@
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">NotUsing</PrecompiledHeader>
     </ClCompile>
     <ClCompile Include="tier0\commandline.cpp" />
-    <ClCompile Include="tier0\ConCommand.cpp" />
+    <ClCompile Include="tier0\cmd.cpp" />
     <ClCompile Include="tier0\completion.cpp" />
     <ClCompile Include="tier0\cvar.cpp" />
     <ClCompile Include="tier0\IConVar.cpp" />
diff --git a/r5dev/dedicated.vcxproj.filters b/r5dev/dedicated.vcxproj.filters
index c8249ec6..6569c9d2 100644
--- a/r5dev/dedicated.vcxproj.filters
+++ b/r5dev/dedicated.vcxproj.filters
@@ -510,7 +510,7 @@
     <ClInclude Include="tier0\basetypes.h">
       <Filter>sdk\tier0</Filter>
     </ClInclude>
-    <ClInclude Include="tier0\ConCommand.h">
+    <ClInclude Include="tier0\cmd.h">
       <Filter>sdk\tier0</Filter>
     </ClInclude>
     <ClInclude Include="vpc\IAppSystem.h">
@@ -779,7 +779,7 @@
     <ClCompile Include="tier0\IConVar.cpp">
       <Filter>sdk\tier0</Filter>
     </ClCompile>
-    <ClCompile Include="tier0\ConCommand.cpp">
+    <ClCompile Include="tier0\cmd.cpp">
       <Filter>sdk\tier0</Filter>
     </ClCompile>
     <ClCompile Include="vpc\IAppSystem.cpp">
diff --git a/r5dev/engine/cl_rcon.cpp b/r5dev/engine/cl_rcon.cpp
index 83077ef7..e670e473 100644
--- a/r5dev/engine/cl_rcon.cpp
+++ b/r5dev/engine/cl_rcon.cpp
@@ -6,7 +6,8 @@
 
 #include "core/stdafx.h"
 #include "tier0/IConVar.h"
-#include "tier0/ConCommand.h"
+#include "tier0/cmd.h"
+#include "tier0/cvar.h"
 #include "engine/cl_rcon.h"
 #include "common/igameserverdata.h"
 
diff --git a/r5dev/engine/sv_rcon.cpp b/r5dev/engine/sv_rcon.cpp
index 9acc2f13..3f401085 100644
--- a/r5dev/engine/sv_rcon.cpp
+++ b/r5dev/engine/sv_rcon.cpp
@@ -5,9 +5,9 @@
 //===========================================================================//
 
 #include "core/stdafx.h"
+#include "tier0/cmd.h"
 #include "tier0/cvar.h"
 #include "tier0/IConVar.h"
-#include "tier0/ConCommand.h"
 #include "tier1/NetAdr2.h"
 #include "tier2/socketcreator.h"
 #include "engine/sys_utils.h"
diff --git a/r5dev/r5dev.vcxproj b/r5dev/r5dev.vcxproj
index 0b973bf1..4a469b67 100644
--- a/r5dev/r5dev.vcxproj
+++ b/r5dev/r5dev.vcxproj
@@ -200,7 +200,7 @@
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">NotUsing</PrecompiledHeader>
     </ClCompile>
     <ClCompile Include="tier0\commandline.cpp" />
-    <ClCompile Include="tier0\ConCommand.cpp" />
+    <ClCompile Include="tier0\cmd.cpp" />
     <ClCompile Include="tier0\completion.cpp" />
     <ClCompile Include="tier0\cvar.cpp" />
     <ClCompile Include="tier0\IConVar.cpp" />
@@ -424,7 +424,7 @@
     <ClInclude Include="thirdparty\spdlog\include\version.h" />
     <ClInclude Include="tier0\basetypes.h" />
     <ClInclude Include="tier0\commandline.h" />
-    <ClInclude Include="tier0\ConCommand.h" />
+    <ClInclude Include="tier0\cmd.h" />
     <ClInclude Include="tier0\completion.h" />
     <ClInclude Include="tier0\cvar.h" />
     <ClInclude Include="tier0\IConVar.h" />
diff --git a/r5dev/r5dev.vcxproj.filters b/r5dev/r5dev.vcxproj.filters
index 973cb22d..2f86d6de 100644
--- a/r5dev/r5dev.vcxproj.filters
+++ b/r5dev/r5dev.vcxproj.filters
@@ -246,7 +246,7 @@
     <ClCompile Include="tier0\IConVar.cpp">
       <Filter>sdk\tier0</Filter>
     </ClCompile>
-    <ClCompile Include="tier0\ConCommand.cpp">
+    <ClCompile Include="tier0\cmd.cpp">
       <Filter>sdk\tier0</Filter>
     </ClCompile>
     <ClCompile Include="vgui\vgui_fpspanel.cpp">
@@ -866,7 +866,7 @@
     <ClInclude Include="tier0\basetypes.h">
       <Filter>sdk\tier0</Filter>
     </ClInclude>
-    <ClInclude Include="tier0\ConCommand.h">
+    <ClInclude Include="tier0\cmd.h">
       <Filter>sdk\tier0</Filter>
     </ClInclude>
     <ClInclude Include="vgui\vgui_fpspanel.h">
diff --git a/r5dev/tier0/IConVar.h b/r5dev/tier0/IConVar.h
index f157d38c..ea86c6c6 100644
--- a/r5dev/tier0/IConVar.h
+++ b/r5dev/tier0/IConVar.h
@@ -1,5 +1,5 @@
 #pragma once
-#include "ConCommand.h"
+#include "tier0/cmd.h"
 #include "mathlib/color.h"
 
 //-----------------------------------------------------------------------------
diff --git a/r5dev/tier0/ConCommand.cpp b/r5dev/tier0/cmd.cpp
similarity index 99%
rename from r5dev/tier0/ConCommand.cpp
rename to r5dev/tier0/cmd.cpp
index d333d356..849044a4 100644
--- a/r5dev/tier0/ConCommand.cpp
+++ b/r5dev/tier0/cmd.cpp
@@ -1,7 +1,7 @@
 #include "core/stdafx.h"
+#include "tier0/cmd.h"
 #include "tier0/cvar.h"
 #include "tier0/completion.h"
-#include "tier0/ConCommand.h"
 #include "client/client.h"
 #include "engine/sys_utils.h"
 
diff --git a/r5dev/tier0/ConCommand.h b/r5dev/tier0/cmd.h
similarity index 100%
rename from r5dev/tier0/ConCommand.h
rename to r5dev/tier0/cmd.h