From 19f5010bd26e010746436766c05515dff85d7695 Mon Sep 17 00:00:00 2001
From: Amos <48657826+Mauler125@users.noreply.github.com>
Date: Sun, 9 Jan 2022 16:29:36 +0100
Subject: [PATCH] Fix compiler error + rename debug dll's

Rename for easier debugging and config separation
---
 r5dev/dedicated.vcxproj           | 2 +-
 r5dev/dedicated.vcxproj.filters   | 2 +-
 r5dev/r5dev.vcxproj               | 4 ++--
 r5dev/sdklauncher/sdklauncher.cpp | 4 ++--
 r5dev/tier0/IConVar.cpp           | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/r5dev/dedicated.vcxproj b/r5dev/dedicated.vcxproj
index a65957fe..b3aef01a 100644
--- a/r5dev/dedicated.vcxproj
+++ b/r5dev/dedicated.vcxproj
@@ -374,7 +374,7 @@
     <ClCompile Include="engine\sys_utils.cpp" />
     <ClCompile Include="launcher\IApplication.cpp" />
     <ClCompile Include="mathlib\adler32.cpp" />
-    <ClCompile Include="mathlib\bits.c" />
+    <ClCompile Include="mathlib\bits.cpp" />
     <ClCompile Include="mathlib\crc32.cpp" />
     <ClCompile Include="mathlib\IceKey.cpp" />
     <ClCompile Include="networksystem\r5net.cpp" />
diff --git a/r5dev/dedicated.vcxproj.filters b/r5dev/dedicated.vcxproj.filters
index 55f98901..11d9800b 100644
--- a/r5dev/dedicated.vcxproj.filters
+++ b/r5dev/dedicated.vcxproj.filters
@@ -860,7 +860,7 @@
     <ClCompile Include="thirdparty\lzham\lzhamdecomp\lzham_lzdecompbase.cpp">
       <Filter>thirdparty\lzham\lzhamdecomp</Filter>
     </ClCompile>
-    <ClCompile Include="mathlib\bits.c">
+    <ClCompile Include="mathlib\bits.cpp">
       <Filter>sdk\mathlib</Filter>
     </ClCompile>
   </ItemGroup>
diff --git a/r5dev/r5dev.vcxproj b/r5dev/r5dev.vcxproj
index 0f8ec856..a808b972 100644
--- a/r5dev/r5dev.vcxproj
+++ b/r5dev/r5dev.vcxproj
@@ -497,7 +497,7 @@
     <LinkIncremental>true</LinkIncremental>
     <IncludePath>$(SolutionDir)r5dev\;$(IncludePath);$(DXSDK_DIR)Include</IncludePath>
     <LibraryPath>$(SolutionDir)r5dev\thirdparty\detours\libs;$(SolutionDir)r5dev\thirdparty\lzham\libs;$(LibraryPath);$(DXSDK_DIR)Lib\x64</LibraryPath>
-    <TargetName>r5apexvtxd</TargetName>
+    <TargetName>r5apexsdkd</TargetName>
     <OutDir>$(SolutionDir)bin\$(Configuration)\</OutDir>
     <IntDir>$(SolutionDir)build\$(ProjectName)\$(Configuration)\</IntDir>
     <ReferencePath>$(VC_ReferencesPath_x64);</ReferencePath>
@@ -568,7 +568,7 @@
       <AdditionalDependencies>d3d11.lib;bcrypt.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
     <PostBuildEvent>
-      <Command>copy /Y "$(TargetPath)" "..\..\..\bin\$(TargetFileName)"</Command>
+      <Command>copy /Y "$(TargetPath)" "..\..\..\$(TargetFileName)" &amp;&amp; del "..\..\..\r5apexsdkd64.dll" &amp;&amp; rename "..\..\..\$(TargetFileName)" "r5apexsdkd64.dll"</Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
diff --git a/r5dev/sdklauncher/sdklauncher.cpp b/r5dev/sdklauncher/sdklauncher.cpp
index 5f180795..b9f114e6 100644
--- a/r5dev/sdklauncher/sdklauncher.cpp
+++ b/r5dev/sdklauncher/sdklauncher.cpp
@@ -56,7 +56,7 @@ bool LaunchR5Apex(LAUNCHMODE lMode, LAUNCHSTATE lState)
             }
             cfgFile.close(); // Close cfg file.
 
-            WorkerDll           = currentDirectory + "\\bin\\r5apexvtxd.dll";                // Get path to worker dll.
+            WorkerDll           = currentDirectory + "\\r5apexsdkd64.dll";                   // Get path to worker dll.
             GameDirectory       = currentDirectory + "\\r5apex.exe";                         // Get path to game executeable.
             StartupCommandLine  = currentDirectory + "\\r5apex.exe " + CommandLineArguments; // Setup startup command line string.
 
@@ -106,7 +106,7 @@ bool LaunchR5Apex(LAUNCHMODE lMode, LAUNCHSTATE lState)
             }
             cfgFile.close(); // Close cfg file.
 
-            WorkerDll          = currentDirectory + "\\dedicated.dll";                      // Get path to worker dll.
+            WorkerDll          = currentDirectory + "\\dedicated.dll";                         // Get path to worker dll.
             GameDirectory      = currentDirectory + "\\r5apex_ds.exe";                         // Get path to game executeable.
             StartupCommandLine = currentDirectory + "\\r5apex_ds.exe " + CommandLineArguments; // Setup startup command line string.
 
diff --git a/r5dev/tier0/IConVar.cpp b/r5dev/tier0/IConVar.cpp
index 60771b4b..fa7b5520 100644
--- a/r5dev/tier0/IConVar.cpp
+++ b/r5dev/tier0/IConVar.cpp
@@ -417,7 +417,7 @@ void ConVar::SetDefault(const char* pszDefault)
 //-----------------------------------------------------------------------------
 void ConVar::ChangeStringValue(const char* pszTempVal, float flOldValue)
 {
-	assert(!(m_nFlags & FCVAR_NEVER_AS_STRING));
+	assert(!(m_ConCommandBase.m_nFlags & FCVAR_NEVER_AS_STRING));
 
 	char* pszOldValue = (char*)_malloca(m_iStringLength);
 	if (pszOldValue != NULL)