Remove duplicate interface.h/.cpp files

Resolves twhl-community#60 (cherry picked from commit 217f615)
LogicAndTrick · Dec 24, 2021 · fe675d6 · fe675d6
1 parent f6cc3ab
commit fe675d6
Show file tree

Hide file tree

Showing 11 changed files with 1 addition and 288 deletions.
diff --git a/cl_dll/cdll_int.cpp b/cl_dll/cdll_int.cpp
@@ -21,21 +21,19 @@
 #include "hud.h"
 #include "cl_util.h"
 #include "netadr.h"
-#include "../public/interface.h"
+#include "interface.h"
 //#include "vgui_schememanager.h"
 
 #include "pm_shared.h"
 
 #include <string.h>
 #include "vgui_int.h"
-#include "interface.h"
 
 #include "Platform.h"
 #include "Exports.h"
 
 #include "tri.h"
 #include "vgui_TeamFortressViewport.h"
-#include "../public/interface.h"
 
 cl_enginefunc_t gEngfuncs;
 CHud gHUD;

diff --git a/common/interface.cpp b/common/interface.cpp
diff --git a/common/interface.h b/common/interface.h
diff --git a/projects/vs2017/hl_cdll.vcxproj b/projects/vs2017/hl_cdll.vcxproj
@@ -233,7 +233,6 @@
     <ClInclude Include="..\..\common\event_args.h" />
     <ClInclude Include="..\..\common\event_flags.h" />
     <ClInclude Include="..\..\common\hltv.h" />
-    <ClInclude Include="..\..\common\interface.h" />
     <ClInclude Include="..\..\common\in_buttons.h" />
     <ClInclude Include="..\..\common\ivoicetweak.h" />
     <ClInclude Include="..\..\common\mathlib.h" />

diff --git a/projects/vs2017/hl_cdll.vcxproj.filters b/projects/vs2017/hl_cdll.vcxproj.filters
@@ -467,9 +467,6 @@
     <ClInclude Include="..\..\common\in_buttons.h">
       <Filter>Header Files\common</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\common\interface.h">
-      <Filter>Header Files\common</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\common\ivoicetweak.h">
       <Filter>Header Files\common</Filter>
     </ClInclude>

diff --git a/projects/vs2017/hldll.vcxproj b/projects/vs2017/hldll.vcxproj
@@ -228,7 +228,6 @@
     <ClInclude Include="..\..\common\event_args.h" />
     <ClInclude Include="..\..\common\event_flags.h" />
     <ClInclude Include="..\..\common\hltv.h" />
-    <ClInclude Include="..\..\common\interface.h" />
     <ClInclude Include="..\..\common\in_buttons.h" />
     <ClInclude Include="..\..\common\mathlib.h" />
     <ClInclude Include="..\..\common\netadr.h" />

diff --git a/projects/vs2017/hldll.vcxproj.filters b/projects/vs2017/hldll.vcxproj.filters
@@ -575,9 +575,6 @@
     <ClInclude Include="..\..\common\in_buttons.h">
       <Filter>Header Files\common</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\common\interface.h">
-      <Filter>Header Files\common</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\common\netadr.h">
       <Filter>Header Files\common</Filter>
     </ClInclude>

diff --git a/projects/vs2019/hl_cdll.vcxproj b/projects/vs2019/hl_cdll.vcxproj
@@ -235,7 +235,6 @@ EXIT /B 0</Command>
     <ClInclude Include="..\..\common\event_args.h" />
     <ClInclude Include="..\..\common\event_flags.h" />
     <ClInclude Include="..\..\common\hltv.h" />
-    <ClInclude Include="..\..\common\interface.h" />
     <ClInclude Include="..\..\common\in_buttons.h" />
     <ClInclude Include="..\..\common\ivoicetweak.h" />
     <ClInclude Include="..\..\common\mathlib.h" />

diff --git a/projects/vs2019/hl_cdll.vcxproj.filters b/projects/vs2019/hl_cdll.vcxproj.filters
@@ -488,9 +488,6 @@
     <ClInclude Include="..\..\common\in_buttons.h">
       <Filter>Header Files\common</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\common\interface.h">
-      <Filter>Header Files\common</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\common\ivoicetweak.h">
       <Filter>Header Files\common</Filter>
     </ClInclude>

diff --git a/projects/vs2019/hldll.vcxproj b/projects/vs2019/hldll.vcxproj
@@ -233,7 +233,6 @@ EXIT /B 0</Command>
     <ClInclude Include="..\..\common\event_args.h" />
     <ClInclude Include="..\..\common\event_flags.h" />
     <ClInclude Include="..\..\common\hltv.h" />
-    <ClInclude Include="..\..\common\interface.h" />
     <ClInclude Include="..\..\common\in_buttons.h" />
     <ClInclude Include="..\..\common\mathlib.h" />
     <ClInclude Include="..\..\common\netadr.h" />

diff --git a/projects/vs2019/hldll.vcxproj.filters b/projects/vs2019/hldll.vcxproj.filters
@@ -584,9 +584,6 @@
     <ClInclude Include="..\..\common\in_buttons.h">
       <Filter>Header Files\common</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\common\interface.h">
-      <Filter>Header Files\common</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\common\netadr.h">
       <Filter>Header Files\common</Filter>
     </ClInclude>