diff --git a/r5dev/client/cdll_engine_int.cpp b/r5dev/client/cdll_engine_int.cpp index 4e9275fa..e50a726c 100644 --- a/r5dev/client/cdll_engine_int.cpp +++ b/r5dev/client/cdll_engine_int.cpp @@ -12,7 +12,7 @@ #include "client/cdll_engine_int.h" #include "engine/net_chan.h" #include "engine/client/cl_rcon.h" -#include "public/bansystem.h" +#include "networksystem/bansystem.h" #include "vpc/keyvalues.h" /*****************************************************************************/ diff --git a/r5dev/engine/host_state.cpp b/r5dev/engine/host_state.cpp index a4d7d315..3a94c3f6 100644 --- a/r5dev/engine/host_state.cpp +++ b/r5dev/engine/host_state.cpp @@ -41,7 +41,7 @@ #endif // DEDICATED #include "client/vengineclient_impl.h" #include "networksystem/pylon.h" -#include "public/bansystem.h" +#include "networksystem/bansystem.h" #include "public/edict.h" #ifndef CLIENT_DLL #include "game/server/gameinterface.h" diff --git a/r5dev/engine/server/server.cpp b/r5dev/engine/server/server.cpp index 29b04c0b..0f34a423 100644 --- a/r5dev/engine/server/server.cpp +++ b/r5dev/engine/server/server.cpp @@ -14,8 +14,8 @@ #include "engine/server/sv_main.h" #include "engine/server/server.h" #include "networksystem/pylon.h" +#include "networksystem/bansystem.h" #include "public/edict.h" -#include "public/bansystem.h" //--------------------------------------------------------------------------------- // Purpose: Gets the number of human players on the server diff --git a/r5dev/engine/server/sv_main.cpp b/r5dev/engine/server/sv_main.cpp index e9fa29b6..b91033be 100644 --- a/r5dev/engine/server/sv_main.cpp +++ b/r5dev/engine/server/sv_main.cpp @@ -1,7 +1,7 @@ #include "core/stdafx.h" #include "engine/server/sv_main.h" #include "networksystem/pylon.h" -#include "public/bansystem.h" +#include "networksystem/bansystem.h" //----------------------------------------------------------------------------- // Purpose: checks if particular client is banned on the comp server diff --git a/r5dev/engine/server/sv_main.h b/r5dev/engine/server/sv_main.h index e98c89ac..8dc7e369 100644 --- a/r5dev/engine/server/sv_main.h +++ b/r5dev/engine/server/sv_main.h @@ -1,6 +1,6 @@ #pragma once #include "networksystem/pylon.h" -#include "public/bansystem.h" +#include "networksystem/bansystem.h" /////////////////////////////////////////////////////////////////////////////// diff --git a/r5dev/public/bansystem.cpp b/r5dev/networksystem/bansystem.cpp similarity index 99% rename from r5dev/public/bansystem.cpp rename to r5dev/networksystem/bansystem.cpp index 81c229f4..46924f7c 100644 --- a/r5dev/public/bansystem.cpp +++ b/r5dev/networksystem/bansystem.cpp @@ -8,7 +8,7 @@ #include "core/stdafx.h" #include "engine/net.h" #include "engine/client/client.h" -#include "public/bansystem.h" +#include "networksystem/bansystem.h" //----------------------------------------------------------------------------- // Purpose: diff --git a/r5dev/public/bansystem.h b/r5dev/networksystem/bansystem.h similarity index 100% rename from r5dev/public/bansystem.h rename to r5dev/networksystem/bansystem.h diff --git a/r5dev/vproj/dedicated.vcxproj b/r5dev/vproj/dedicated.vcxproj index aaa1ab33..5f817032 100644 --- a/r5dev/vproj/dedicated.vcxproj +++ b/r5dev/vproj/dedicated.vcxproj @@ -206,6 +206,7 @@ <ClInclude Include="..\mathlib\vector4d.h" /> <ClInclude Include="..\mathlib\vmatrix.h" /> <ClInclude Include="..\mathlib\vplane.h" /> + <ClInclude Include="..\networksystem\bansystem.h" /> <ClInclude Include="..\networksystem\pylon.h" /> <ClInclude Include="..\networksystem\serverlisting.h" /> <ClInclude Include="..\networksystem\sm_protocol.h" /> @@ -224,7 +225,6 @@ <ClInclude Include="..\public\inetmsghandler.h" /> <ClInclude Include="..\public\iserver.h" /> <ClInclude Include="..\public\ivscript.h" /> - <ClInclude Include="..\public\bansystem.h" /> <ClInclude Include="..\public\model_types.h" /> <ClInclude Include="..\public\studio.h" /> <ClInclude Include="..\public\utility\binstream.h" /> @@ -518,6 +518,7 @@ <ClCompile Include="..\mathlib\ssenoise.cpp" /> <ClCompile Include="..\mathlib\transform.cpp" /> <ClCompile Include="..\mathlib\vmatrix.cpp" /> + <ClCompile Include="..\networksystem\bansystem.cpp" /> <ClCompile Include="..\networksystem\pylon.cpp" /> <ClCompile Include="..\protoc\cl_rcon.pb.cc"> <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">NotUsing</PrecompiledHeader> @@ -527,7 +528,6 @@ <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">NotUsing</PrecompiledHeader> <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">NotUsing</PrecompiledHeader> </ClCompile> - <ClCompile Include="..\public\bansystem.cpp" /> <ClCompile Include="..\public\utility\binstream.cpp" /> <ClCompile Include="..\public\utility\memaddr.cpp" /> <ClCompile Include="..\public\utility\module.cpp" /> diff --git a/r5dev/vproj/dedicated.vcxproj.filters b/r5dev/vproj/dedicated.vcxproj.filters index cf3fc864..ac1a1d6c 100644 --- a/r5dev/vproj/dedicated.vcxproj.filters +++ b/r5dev/vproj/dedicated.vcxproj.filters @@ -243,9 +243,6 @@ <ClInclude Include="..\networksystem\sm_protocol.h"> <Filter>sdk\networksystem</Filter> </ClInclude> - <ClInclude Include="..\public\bansystem.h"> - <Filter>sdk\public</Filter> - </ClInclude> <ClInclude Include="..\rtech\rtech_utils.h"> <Filter>sdk\rtech</Filter> </ClInclude> @@ -1206,6 +1203,9 @@ <ClInclude Include="..\public\utility\httplib.h"> <Filter>sdk\public\utility</Filter> </ClInclude> + <ClInclude Include="..\networksystem\bansystem.h"> + <Filter>sdk\networksystem</Filter> + </ClInclude> </ItemGroup> <ItemGroup> <ClCompile Include="..\common\opcodes.cpp"> @@ -1241,9 +1241,6 @@ <ClCompile Include="..\launcher\IApplication.cpp"> <Filter>sdk\launcher</Filter> </ClCompile> - <ClCompile Include="..\public\bansystem.cpp"> - <Filter>sdk\public</Filter> - </ClCompile> <ClCompile Include="..\rtech\rtech_utils.cpp"> <Filter>sdk\rtech</Filter> </ClCompile> @@ -1511,6 +1508,9 @@ <ClCompile Include="..\public\utility\binstream.cpp"> <Filter>sdk\public\utility</Filter> </ClCompile> + <ClCompile Include="..\networksystem\bansystem.cpp"> + <Filter>sdk\networksystem</Filter> + </ClCompile> </ItemGroup> <ItemGroup> <None Include="..\Dedicated.def" /> diff --git a/r5dev/vproj/gamesdk.vcxproj b/r5dev/vproj/gamesdk.vcxproj index 2008dff8..8ea055ba 100644 --- a/r5dev/vproj/gamesdk.vcxproj +++ b/r5dev/vproj/gamesdk.vcxproj @@ -83,6 +83,7 @@ <ClCompile Include="..\mathlib\ssenoise.cpp" /> <ClCompile Include="..\mathlib\transform.cpp" /> <ClCompile Include="..\mathlib\vmatrix.cpp" /> + <ClCompile Include="..\networksystem\bansystem.cpp" /> <ClCompile Include="..\networksystem\pylon.cpp" /> <ClCompile Include="..\protoc\cl_rcon.pb.cc"> <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">NotUsing</PrecompiledHeader> @@ -92,7 +93,6 @@ <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">NotUsing</PrecompiledHeader> <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">NotUsing</PrecompiledHeader> </ClCompile> - <ClCompile Include="..\public\bansystem.cpp" /> <ClCompile Include="..\public\utility\binstream.cpp" /> <ClCompile Include="..\public\utility\memaddr.cpp" /> <ClCompile Include="..\public\utility\module.cpp" /> @@ -251,6 +251,7 @@ <ClInclude Include="..\mathlib\vmatrix.h" /> <ClInclude Include="..\mathlib\vplane.h" /> <ClInclude Include="..\milessdk\win64_rrthreads.h" /> + <ClInclude Include="..\networksystem\bansystem.h" /> <ClInclude Include="..\networksystem\pylon.h" /> <ClInclude Include="..\networksystem\serverlisting.h" /> <ClInclude Include="..\networksystem\sm_protocol.h" /> @@ -281,7 +282,6 @@ <ClInclude Include="..\public\iserver.h" /> <ClInclude Include="..\public\ivrenderview.h" /> <ClInclude Include="..\public\ivscript.h" /> - <ClInclude Include="..\public\bansystem.h" /> <ClInclude Include="..\public\model_types.h" /> <ClInclude Include="..\public\studio.h" /> <ClInclude Include="..\core\resource.h" /> diff --git a/r5dev/vproj/gamesdk.vcxproj.filters b/r5dev/vproj/gamesdk.vcxproj.filters index 948e665d..199828ac 100644 --- a/r5dev/vproj/gamesdk.vcxproj.filters +++ b/r5dev/vproj/gamesdk.vcxproj.filters @@ -261,9 +261,6 @@ <ClCompile Include="..\gameui\IConsole.cpp"> <Filter>sdk\gameui</Filter> </ClCompile> - <ClCompile Include="..\public\bansystem.cpp"> - <Filter>sdk\public</Filter> - </ClCompile> <ClCompile Include="..\rtech\rtech_utils.cpp"> <Filter>sdk\rtech</Filter> </ClCompile> @@ -612,6 +609,9 @@ <ClCompile Include="..\public\utility\memaddr.cpp"> <Filter>sdk\public\utility</Filter> </ClCompile> + <ClCompile Include="..\networksystem\bansystem.cpp"> + <Filter>sdk\networksystem</Filter> + </ClCompile> </ItemGroup> <ItemGroup> <ClInclude Include="..\client\cdll_engine_int.h"> @@ -647,9 +647,6 @@ <ClInclude Include="..\gameui\IConsole.h"> <Filter>sdk\gameui</Filter> </ClInclude> - <ClInclude Include="..\public\bansystem.h"> - <Filter>sdk\public</Filter> - </ClInclude> <ClInclude Include="..\rtech\rtech_utils.h"> <Filter>sdk\rtech</Filter> </ClInclude> @@ -1772,6 +1769,9 @@ <ClInclude Include="..\public\utility\httplib.h"> <Filter>sdk\public\utility</Filter> </ClInclude> + <ClInclude Include="..\networksystem\bansystem.h"> + <Filter>sdk\networksystem</Filter> + </ClInclude> </ItemGroup> <ItemGroup> <Image Include="..\shared\resource\lockedserver.png"> diff --git a/r5dev/vstdlib/callback.cpp b/r5dev/vstdlib/callback.cpp index 96466c45..b1c529a1 100644 --- a/r5dev/vstdlib/callback.cpp +++ b/r5dev/vstdlib/callback.cpp @@ -31,7 +31,7 @@ #include "gameui/IConsole.h" #endif // !DEDICATED #ifndef CLIENT_DLL -#include "public/bansystem.h" +#include "networksystem/bansystem.h" #endif // !CLIENT_DLL #include "public/worldsize.h" #include "mathlib/crc32.h"