* Follow up 5ed75dc8, disabled `val2` on `chmapif_parse_fwlog_changestatus`

* Clean up MSVS vcxproj files. Added new filter for `config` files and moving the files to their filter.

[ci skip]
Signed-off-by: Cydh Ramdh <cydh@pservero.com>

src/char/char_mapif.c

@@ -733,7 +733,7 @@ int chmapif_parse_fwlog_changestatus(int fd){
 		int operation = RFIFOW(fd,30); // type of operation: 1-block, 2-ban, 3-unblock, 4-unban, 5-changesex, 6-vip
 		int32 timediff = RFIFOL(fd,32);
 		int val1 = RFIFOL(fd,36);
-		int val2 = RFIFOL(fd,40);
+		//int val2 = RFIFOL(fd,40); // Since BankVault is moved out, this value is unused for now
 		RFIFOSKIP(fd,44);
 
 		Sql_EscapeStringLen(sql_handle, esc_name, name, strnlen(name, NAME_LENGTH));
@@ -757,8 +757,8 @@ int chmapif_parse_fwlog_changestatus(int fd){
 			//FIXME: need to move this check to login server [ultramage]
 			//	if( acc != -1 && isGM(acc) < isGM(account_id) )
 			//		result = 2; // 2-gm level too low
-			//! NOTE: See src/char/chrif.h::enum chrif_req_op for the number
 			else {
+				//! NOTE: See src/char/chrif.h::enum chrif_req_op for the number
 				switch( operation ) {
 					case 1: // block
 						WFIFOHEAD(login_fd,10);

vcproj-10/char-server.vcxproj

@@ -159,6 +159,8 @@
     <ClInclude Include="..\src\common\utils.h" />
     <ClInclude Include="..\src\common\msg_conf.h" />
     <ClInclude Include="..\src\common\cli.h" />
+    <ClInclude Include="..\src\common\winapi.h" />
+    <ClInclude Include="..\src\config\core.h" />
     <ClInclude Include="..\src\char\char.h" />
     <ClInclude Include="..\src\char\char_clif.h" />
     <ClInclude Include="..\src\char\char_cnslif.h" />
@@ -175,7 +177,6 @@
     <ClInclude Include="..\src\char\int_quest.h" />
     <ClInclude Include="..\src\char\int_storage.h" />
     <ClInclude Include="..\src\char\inter.h" />
-    <ClInclude Include="..\src\common\winapi.h" />
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\3rdparty\libconfig\grammar.c" />

vcproj-10/char-server.vcxproj.filters

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <ClCompile Include="..\src\common\core.c">
@@ -118,8 +118,12 @@
     <ClCompile Include="..\src\common\raconf.c">
       <Filter>common</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\common\msg_conf.c" />
-    <ClCompile Include="..\src\common\cli.c" />
+    <ClCompile Include="..\src\common\msg_conf.c">
+      <Filter>common</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\common\cli.c">
+      <Filter>common</Filter>
+    </ClCompile>
     <ClCompile Include="..\src\common\conf.c">
       <Filter>common</Filter>
     </ClCompile>
@@ -257,11 +261,18 @@
     <ClInclude Include="..\src\common\raconf.h">
       <Filter>common</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\common\msg_conf.h" />
-    <ClInclude Include="..\src\common\cli.h" />
+    <ClInclude Include="..\src\common\msg_conf.h">
+      <Filter>common</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\common\cli.h">
+      <Filter>common</Filter>
+    </ClInclude>
     <ClInclude Include="..\src\common\conf.h">
       <Filter>common</Filter>
     </ClInclude>
+    <ClInclude Include="..\src\config\core.h">
+      <Filter>config</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <Filter Include="common">
@@ -279,5 +290,8 @@
     <Filter Include="3rdparty\libconfig">
       <UniqueIdentifier>{9e8badd7-548f-4eb4-9e87-613e87e772ff}</UniqueIdentifier>
     </Filter>
+    <Filter Include="config">
+      <UniqueIdentifier>{6489e7a1-f724-450c-86b4-f98d40eebb3a}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
 </Project>

vcproj-10/login-server.vcxproj

@@ -138,19 +138,13 @@
     <ClInclude Include="..\3rdparty\libconfig\scanner.h" />
     <ClInclude Include="..\3rdparty\libconfig\strbuf.h" />
     <ClInclude Include="..\3rdparty\libconfig\wincompat.h" />
+    <ClInclude Include="..\3rdparty\mt19937ar\mt19937ar.h" />
     <ClInclude Include="..\src\common\conf.h" />
     <ClInclude Include="..\src\common\mempool.h" />
     <ClInclude Include="..\src\common\mutex.h" />
     <ClInclude Include="..\src\common\raconf.h" />
     <ClInclude Include="..\src\common\thread.h" />
     <ClInclude Include="..\src\common\winapi.h" />
-    <ClInclude Include="..\src\login\account.h" />
-    <ClInclude Include="..\src\login\ipban.h" />
-    <ClInclude Include="..\src\login\login.h" />
-    <ClInclude Include="..\src\login\loginchrif.h" />
-    <ClInclude Include="..\src\login\loginclif.h" />
-    <ClInclude Include="..\src\login\logincnslif.h" />
-    <ClInclude Include="..\src\login\loginlog.h" />
     <ClInclude Include="..\src\common\cbasetypes.h" />
     <ClInclude Include="..\src\common\core.h" />
     <ClInclude Include="..\src\common\db.h" />
@@ -168,7 +162,14 @@
     <ClInclude Include="..\src\common\utils.h" />
     <ClInclude Include="..\src\common\msg_conf.h" />
     <ClInclude Include="..\src\common\cli.h" />
-    <ClInclude Include="..\3rdparty\mt19937ar\mt19937ar.h" />
+    <ClInclude Include="..\src\config\core.h" />
+    <ClInclude Include="..\src\login\account.h" />
+    <ClInclude Include="..\src\login\ipban.h" />
+    <ClInclude Include="..\src\login\login.h" />
+    <ClInclude Include="..\src\login\loginchrif.h" />
+    <ClInclude Include="..\src\login\loginclif.h" />
+    <ClInclude Include="..\src\login\logincnslif.h" />
+    <ClInclude Include="..\src\login\loginlog.h" />
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\3rdparty\libconfig\grammar.c" />
@@ -176,18 +177,12 @@
     <ClCompile Include="..\3rdparty\libconfig\scanctx.c" />
     <ClCompile Include="..\3rdparty\libconfig\scanner.c" />
     <ClCompile Include="..\3rdparty\libconfig\strbuf.c" />
+    <ClCompile Include="..\3rdparty\mt19937ar\mt19937ar.c" />
     <ClCompile Include="..\src\common\conf.c" />
     <ClCompile Include="..\src\common\mempool.c" />
     <ClCompile Include="..\src\common\mutex.c" />
     <ClCompile Include="..\src\common\raconf.c" />
     <ClCompile Include="..\src\common\thread.c" />
-    <ClCompile Include="..\src\login\account.c" />
-    <ClCompile Include="..\src\login\ipban.c" />
-    <ClCompile Include="..\src\login\login.c" />
-    <ClCompile Include="..\src\login\loginchrif.c" />
-    <ClCompile Include="..\src\login\loginclif.c" />
-    <ClCompile Include="..\src\login\logincnslif.c" />
-    <ClCompile Include="..\src\login\loginlog.c" />
     <ClCompile Include="..\src\common\core.c" />
     <ClCompile Include="..\src\common\db.c" />
     <ClCompile Include="..\src\common\ers.c" />
@@ -203,7 +198,13 @@
     <ClCompile Include="..\src\common\utils.c" />
     <ClCompile Include="..\src\common\msg_conf.c" />
     <ClCompile Include="..\src\common\cli.c" />
-    <ClCompile Include="..\3rdparty\mt19937ar\mt19937ar.c" />
+    <ClCompile Include="..\src\login\account.c" />
+    <ClCompile Include="..\src\login\ipban.c" />
+    <ClCompile Include="..\src\login\login.c" />
+    <ClCompile Include="..\src\login\loginchrif.c" />
+    <ClCompile Include="..\src\login\loginclif.c" />
+    <ClCompile Include="..\src\login\logincnslif.c" />
+    <ClCompile Include="..\src\login\loginlog.c" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">

vcproj-10/login-server.vcxproj.filters

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <ClCompile Include="..\src\login\account.c">
@@ -91,8 +91,12 @@
     <ClCompile Include="..\src\common\raconf.c">
       <Filter>common</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\common\msg_conf.c" />
-    <ClCompile Include="..\src\common\cli.c" />
+    <ClCompile Include="..\src\common\msg_conf.c">
+      <Filter>common</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\common\cli.c">
+      <Filter>common</Filter>
+    </ClCompile>
     <ClCompile Include="..\src\common\conf.c">
       <Filter>common</Filter>
     </ClCompile>
@@ -203,11 +207,18 @@
     <ClInclude Include="..\src\common\raconf.h">
       <Filter>common</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\common\msg_conf.h" />
-    <ClInclude Include="..\src\common\cli.h" />
+    <ClInclude Include="..\src\common\msg_conf.h">
+      <Filter>common</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\common\cli.h">
+      <Filter>common</Filter>
+    </ClInclude>
     <ClInclude Include="..\src\common\conf.h">
       <Filter>common</Filter>
     </ClInclude>
+    <ClInclude Include="..\src\config\core.h">
+      <Filter>config</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <Filter Include="common">
@@ -225,5 +236,8 @@
     <Filter Include="3rdparty\libconfig">
       <UniqueIdentifier>{779e8145-9bb2-4a88-9149-60586ab0bdd4}</UniqueIdentifier>
     </Filter>
+    <Filter Include="config">
+      <UniqueIdentifier>{9aa58d37-a3b4-436e-94f2-3776f379251a}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
 </Project>

vcproj-10/map-server.vcxproj.filters

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <ClCompile Include="..\src\map\atcommand.c">
@@ -115,6 +115,9 @@
     <ClCompile Include="..\src\map\vending.c">
       <Filter>map</Filter>
     </ClCompile>
+    <ClCompile Include="..\src\common\cli.c">
+      <Filter>common</Filter>
+    </ClCompile>
     <ClCompile Include="..\src\common\core.c">
       <Filter>common</Filter>
     </ClCompile>
@@ -139,6 +142,9 @@
     <ClCompile Include="..\src\common\md5calc.c">
       <Filter>common</Filter>
     </ClCompile>
+    <ClCompile Include="..\src\common\msg_conf.c">
+      <Filter>common</Filter>
+    </ClCompile>
     <ClCompile Include="..\src\common\nullpo.c">
       <Filter>common</Filter>
     </ClCompile>
@@ -315,6 +321,9 @@
     <ClInclude Include="..\src\common\cbasetypes.h">
       <Filter>common</Filter>
     </ClInclude>
+    <ClInclude Include="..\src\common\cli.h">
+      <Filter>common</Filter>
+    </ClInclude>
     <ClInclude Include="..\src\common\core.h">
       <Filter>common</Filter>
     </ClInclude>
@@ -342,6 +351,9 @@
     <ClInclude Include="..\src\common\mmo.h">
       <Filter>common</Filter>
     </ClInclude>
+    <ClInclude Include="..\src\common\msg_conf.h">
+      <Filter>common</Filter>
+    </ClInclude>
     <ClInclude Include="..\src\common\nullpo.h">
       <Filter>common</Filter>
     </ClInclude>
@@ -363,11 +375,6 @@
     <ClInclude Include="..\src\common\utils.h">
       <Filter>common</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\config\const.h" />
-    <ClInclude Include="..\src\config\core.h" />
-    <ClInclude Include="..\src\config\renewal.h" />
-    <ClInclude Include="..\src\config\secure.h" />
-    <ClInclude Include="..\src\config\classes\general.h" />
     <ClInclude Include="..\src\common\conf.h">
       <Filter>common</Filter>
     </ClInclude>
@@ -416,6 +423,21 @@
     <ClInclude Include="..\src\common\raconf.h">
       <Filter>common</Filter>
     </ClInclude>
+    <ClInclude Include="..\src\config\secure.h">
+      <Filter>config</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\config\const.h">
+      <Filter>config</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\config\core.h">
+      <Filter>config</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\config\renewal.h">
+      <Filter>config</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\config\classes\general.h">
+      <Filter>config\classes</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <Filter Include="common">
@@ -433,5 +455,11 @@
     <Filter Include="3rdparty\libconfig">
       <UniqueIdentifier>{9caf40b7-c4d1-43b4-bd1f-0376b4f920e7}</UniqueIdentifier>
     </Filter>
+    <Filter Include="config">
+      <UniqueIdentifier>{3308d722-72ef-4a4c-a7aa-892d173c8ea3}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="config\classes">
+      <UniqueIdentifier>{dc4ce819-c8e2-4c38-b929-5a57d01e6657}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
 </Project>

vcproj-10/mapcache.vcxproj.filters

@@ -57,6 +57,9 @@
     <ClInclude Include="..\src\common\winapi.h">
       <Filter>common</Filter>
     </ClInclude>
+    <ClInclude Include="..\src\config\renewal.h">
+      <Filter>config</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <Filter Include="common">
@@ -65,5 +68,8 @@
     <Filter Include="mapcache">
       <UniqueIdentifier>{5ea9d6f7-0a10-4bfb-ad39-478e4b1d8a0d}</UniqueIdentifier>
     </Filter>
+    <Filter Include="config">
+      <UniqueIdentifier>{8ccd627c-fbb0-4bd1-bb96-a95bffa1dd8d}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
-</Project>
+</Project>

vcproj-12/char-server.vcxproj

@@ -162,6 +162,8 @@
     <ClInclude Include="..\src\common\utils.h" />
     <ClInclude Include="..\src\common\cli.h" />
     <ClInclude Include="..\src\common\msg_conf.h" />
+    <ClInclude Include="..\src\common\winapi.h" />
+    <ClInclude Include="..\src\config\core.h" />
     <ClInclude Include="..\src\char\char.h" />
     <ClInclude Include="..\src\char\char_clif.h" />
     <ClInclude Include="..\src\char\char_cnslif.h" />
@@ -178,7 +180,6 @@
     <ClInclude Include="..\src\char\int_quest.h" />
     <ClInclude Include="..\src\char\int_storage.h" />
     <ClInclude Include="..\src\char\inter.h" />
-    <ClInclude Include="..\src\common\winapi.h" />
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\3rdparty\libconfig\grammar.c" />

vcproj-12/char-server.vcxproj.filters

@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
+    <ClCompile Include="..\src\common\cli.c">
+      <Filter>common</Filter>
+    </ClCompile>
     <ClCompile Include="..\src\common\core.c">
       <Filter>common</Filter>
     </ClCompile>
@@ -19,6 +22,9 @@
     <ClCompile Include="..\src\common\mapindex.c">
       <Filter>common</Filter>
     </ClCompile>
+    <ClCompile Include="..\src\common\msg_conf.c">
+      <Filter>common</Filter>
+    </ClCompile>
     <ClCompile Include="..\src\common\nullpo.c">
       <Filter>common</Filter>
     </ClCompile>
@@ -129,6 +135,9 @@
     <ClInclude Include="..\src\common\core.h">
       <Filter>common</Filter>
     </ClInclude>
+    <ClInclude Include="..\src\common\cli.h">
+      <Filter>common</Filter>
+    </ClInclude>
     <ClInclude Include="..\src\common\conf.h">
       <Filter>common</Filter>
     </ClInclude>
@@ -147,6 +156,9 @@
     <ClInclude Include="..\src\common\mmo.h">
       <Filter>common</Filter>
     </ClInclude>
+    <ClInclude Include="..\src\common\msg_conf.h">
+      <Filter>common</Filter>
+    </ClInclude>
     <ClInclude Include="..\src\common\nullpo.h">
       <Filter>common</Filter>
     </ClInclude>
@@ -258,6 +270,9 @@
     <ClInclude Include="..\src\common\raconf.h">
       <Filter>common</Filter>
     </ClInclude>
+    <ClInclude Include="..\src\config\core.h">
+      <Filter>config</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <Filter Include="common">
@@ -275,5 +290,8 @@
     <Filter Include="3rdparty\libconfig">
       <UniqueIdentifier>{9e8badd7-548f-4eb4-9e87-613e87e772ff}</UniqueIdentifier>
     </Filter>
+    <Filter Include="config">
+      <UniqueIdentifier>{6489e7a1-f724-450c-86b4-f98d40eebb3a}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
 </Project>

vcproj-12/login-server.vcxproj

@@ -142,18 +142,12 @@
     <ClInclude Include="..\3rdparty\libconfig\scanner.h" />
     <ClInclude Include="..\3rdparty\libconfig\strbuf.h" />
     <ClInclude Include="..\3rdparty\libconfig\wincompat.h" />
+    <ClInclude Include="..\3rdparty\mt19937ar\mt19937ar.h" />
     <ClInclude Include="..\src\common\mempool.h" />
     <ClInclude Include="..\src\common\mutex.h" />
     <ClInclude Include="..\src\common\raconf.h" />
     <ClInclude Include="..\src\common\thread.h" />
     <ClInclude Include="..\src\common\winapi.h" />
-    <ClInclude Include="..\src\login\account.h" />
-    <ClInclude Include="..\src\login\ipban.h" />
-    <ClInclude Include="..\src\login\login.h" />
-    <ClInclude Include="..\src\login\loginlog.h" />
-    <ClInclude Include="..\src\login\loginchrif.h" />
-    <ClInclude Include="..\src\login\loginclif.h" />
-    <ClInclude Include="..\src\login\logincnslif.h" />
     <ClInclude Include="..\src\common\cbasetypes.h" />
     <ClInclude Include="..\src\common\core.h" />
     <ClInclude Include="..\src\common\conf.h" />
@@ -172,7 +166,14 @@
     <ClInclude Include="..\src\common\utils.h" />
     <ClInclude Include="..\src\common\cli.h" />
     <ClInclude Include="..\src\common\msg_conf.h" />
-    <ClInclude Include="..\3rdparty\mt19937ar\mt19937ar.h" />
+    <ClInclude Include="..\src\config\core.h" />
+    <ClInclude Include="..\src\login\account.h" />
+    <ClInclude Include="..\src\login\ipban.h" />
+    <ClInclude Include="..\src\login\login.h" />
+    <ClInclude Include="..\src\login\loginlog.h" />
+    <ClInclude Include="..\src\login\loginchrif.h" />
+    <ClInclude Include="..\src\login\loginclif.h" />
+    <ClInclude Include="..\src\login\logincnslif.h" />
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\3rdparty\libconfig\grammar.c" />
@@ -180,17 +181,11 @@
     <ClCompile Include="..\3rdparty\libconfig\scanctx.c" />
     <ClCompile Include="..\3rdparty\libconfig\scanner.c" />
     <ClCompile Include="..\3rdparty\libconfig\strbuf.c" />
+    <ClCompile Include="..\3rdparty\mt19937ar\mt19937ar.c" />
     <ClCompile Include="..\src\common\mempool.c" />
     <ClCompile Include="..\src\common\mutex.c" />
     <ClCompile Include="..\src\common\raconf.c" />
     <ClCompile Include="..\src\common\thread.c" />
-    <ClCompile Include="..\src\login\account.c" />
-    <ClCompile Include="..\src\login\ipban.c" />
-    <ClCompile Include="..\src\login\login.c" />
-    <ClCompile Include="..\src\login\loginlog.c" />
-    <ClCompile Include="..\src\login\loginchrif.c" />
-    <ClCompile Include="..\src\login\loginclif.c" />
-    <ClCompile Include="..\src\login\logincnslif.c" />
     <ClCompile Include="..\src\common\core.c" />
     <ClCompile Include="..\src\common\conf.c" />
     <ClCompile Include="..\src\common\db.c" />
@@ -207,7 +202,13 @@
     <ClCompile Include="..\src\common\utils.c" />
     <ClCompile Include="..\src\common\cli.c" />
     <ClCompile Include="..\src\common\msg_conf.c" />
-    <ClCompile Include="..\3rdparty\mt19937ar\mt19937ar.c" />
+    <ClCompile Include="..\src\login\account.c" />
+    <ClCompile Include="..\src\login\ipban.c" />
+    <ClCompile Include="..\src\login\login.c" />
+    <ClCompile Include="..\src\login\loginlog.c" />
+    <ClCompile Include="..\src\login\loginchrif.c" />
+    <ClCompile Include="..\src\login\loginclif.c" />
+    <ClCompile Include="..\src\login\logincnslif.c" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">

vcproj-12/login-server.vcxproj.filters

@@ -22,6 +22,9 @@
     <ClCompile Include="..\src\login\loginlog.c">
       <Filter>login</Filter>
     </ClCompile>
+    <ClCompile Include="..\src\common\cli.c">
+      <Filter>common</Filter>
+    </ClCompile>
     <ClCompile Include="..\src\common\core.c">
       <Filter>common</Filter>
     </ClCompile>
@@ -40,6 +43,9 @@
     <ClCompile Include="..\src\common\md5calc.c">
       <Filter>common</Filter>
     </ClCompile>
+    <ClCompile Include="..\src\common\msg_conf.c">
+      <Filter>common</Filter>
+    </ClCompile>
     <ClCompile Include="..\src\common\nullpo.c">
       <Filter>common</Filter>
     </ClCompile>
@@ -120,6 +126,9 @@
     <ClInclude Include="..\src\common\cbasetypes.h">
       <Filter>common</Filter>
     </ClInclude>
+    <ClInclude Include="..\src\common\cli.h">
+      <Filter>common</Filter>
+    </ClInclude>
     <ClInclude Include="..\src\common\core.h">
       <Filter>common</Filter>
     </ClInclude>
@@ -141,6 +150,9 @@
     <ClInclude Include="..\src\common\mmo.h">
       <Filter>common</Filter>
     </ClInclude>
+    <ClInclude Include="..\src\common\msg_conf.h">
+      <Filter>common</Filter>
+    </ClInclude>
     <ClInclude Include="..\src\common\nullpo.h">
       <Filter>common</Filter>
     </ClInclude>
@@ -204,6 +216,9 @@
     <ClInclude Include="..\src\common\raconf.h">
       <Filter>common</Filter>
     </ClInclude>
+    <ClInclude Include="..\src\config\core.h">
+      <Filter>config</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <Filter Include="common">
@@ -221,5 +236,8 @@
     <Filter Include="3rdparty\libconfig">
       <UniqueIdentifier>{779e8145-9bb2-4a88-9149-60586ab0bdd4}</UniqueIdentifier>
     </Filter>
+    <Filter Include="config">
+      <UniqueIdentifier>{9aa58d37-a3b4-436e-94f2-3776f379251a}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
 </Project>

vcproj-12/map-server.vcxproj.filters

@@ -369,11 +369,6 @@
     <ClInclude Include="..\src\common\utils.h">
       <Filter>common</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\config\const.h" />
-    <ClInclude Include="..\src\config\core.h" />
-    <ClInclude Include="..\src\config\renewal.h" />
-    <ClInclude Include="..\src\config\secure.h" />
-    <ClInclude Include="..\src\config\classes\general.h" />
     <ClInclude Include="..\src\common\conf.h">
       <Filter>common</Filter>
     </ClInclude>
@@ -428,6 +423,21 @@
     <ClInclude Include="..\src\common\msg_conf.h">
 		<Filter>common</Filter>
     </ClInclude>
+    <ClInclude Include="..\src\config\secure.h">
+      <Filter>config</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\config\const.h">
+      <Filter>config</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\config\core.h">
+      <Filter>config</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\config\renewal.h">
+      <Filter>config</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\config\classes\general.h">
+      <Filter>config\classes</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <Filter Include="common">
@@ -445,5 +455,11 @@
     <Filter Include="3rdparty\libconfig">
       <UniqueIdentifier>{9caf40b7-c4d1-43b4-bd1f-0376b4f920e7}</UniqueIdentifier>
     </Filter>
+    <Filter Include="config">
+      <UniqueIdentifier>{3308d722-72ef-4a4c-a7aa-892d173c8ea3}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="config\classes">
+      <UniqueIdentifier>{dc4ce819-c8e2-4c38-b929-5a57d01e6657}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
 </Project>

vcproj-12/mapcache.vcxproj.filters

@@ -57,7 +57,9 @@
     <ClInclude Include="..\src\common\winapi.h">
       <Filter>common</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\config\renewal.h" />
+    <ClInclude Include="..\src\config\renewal.h">
+      <Filter>config</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <Filter Include="common">
@@ -66,5 +68,8 @@
     <Filter Include="mapcache">
       <UniqueIdentifier>{5ea9d6f7-0a10-4bfb-ad39-478e4b1d8a0d}</UniqueIdentifier>
     </Filter>
+    <Filter Include="config">
+      <UniqueIdentifier>{8ccd627c-fbb0-4bd1-bb96-a95bffa1dd8d}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
-</Project>
+</Project>

vcproj-13/char-server.vcxproj

@@ -206,6 +206,7 @@
     <ClCompile Include="..\src\common\utils.c" />
     <ClCompile Include="..\src\common\cli.c" />
     <ClCompile Include="..\src\common\msg_conf.c" />
+    <ClInclude Include="..\src\config\core.h" />
     <ClCompile Include="..\src\char\char.c" />
     <ClCompile Include="..\src\char\char_clif.c" />
     <ClCompile Include="..\src\char\char_cnslif.c" />

vcproj-13/char-server.vcxproj.filters

@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
+    <ClCompile Include="..\src\common\cli.c">
+      <Filter>common</Filter>
+    </ClCompile>
     <ClCompile Include="..\src\common\core.c">
       <Filter>common</Filter>
     </ClCompile>
@@ -118,16 +121,20 @@
     <ClCompile Include="..\src\common\mempool.c">
       <Filter>common</Filter>
     </ClCompile>
+    <ClCompile Include="..\src\common\msg_conf.c">
+      <Filter>common</Filter>
+    </ClCompile>
     <ClCompile Include="..\src\common\raconf.c">
       <Filter>common</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\common\cli.c" />
-    <ClCompile Include="..\src\common\msg_conf.c" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\src\common\cbasetypes.h">
       <Filter>common</Filter>
     </ClInclude>
+    <ClInclude Include="..\src\common\cli.h">
+      <Filter>common</Filter>
+    </ClInclude>
     <ClInclude Include="..\src\common\core.h">
       <Filter>common</Filter>
     </ClInclude>
@@ -257,11 +264,15 @@
     <ClInclude Include="..\src\common\mempool.h">
       <Filter>common</Filter>
     </ClInclude>
+    <ClInclude Include="..\src\common\msg_conf.h">
+      <Filter>common</Filter>
+    </ClInclude>
     <ClInclude Include="..\src\common\raconf.h">
       <Filter>common</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\common\cli.h" />
-    <ClInclude Include="..\src\common\msg_conf.h" />
+    <ClInclude Include="..\src\config\core.h">
+      <Filter>config</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <Filter Include="common">
@@ -279,5 +290,8 @@
     <Filter Include="3rdparty\libconfig">
       <UniqueIdentifier>{9e8badd7-548f-4eb4-9e87-613e87e772ff}</UniqueIdentifier>
     </Filter>
+    <Filter Include="config">
+      <UniqueIdentifier>{6489e7a1-f724-450c-86b4-f98d40eebb3a}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
 </Project>

vcproj-13/login-server.vcxproj

@@ -142,18 +142,12 @@
     <ClInclude Include="..\3rdparty\libconfig\scanner.h" />
     <ClInclude Include="..\3rdparty\libconfig\strbuf.h" />
     <ClInclude Include="..\3rdparty\libconfig\wincompat.h" />
+    <ClInclude Include="..\3rdparty\mt19937ar\mt19937ar.h" />
     <ClInclude Include="..\src\common\mempool.h" />
     <ClInclude Include="..\src\common\mutex.h" />
     <ClInclude Include="..\src\common\raconf.h" />
     <ClInclude Include="..\src\common\thread.h" />
     <ClInclude Include="..\src\common\winapi.h" />
-    <ClInclude Include="..\src\login\account.h" />
-    <ClInclude Include="..\src\login\ipban.h" />
-    <ClInclude Include="..\src\login\login.h" />
-    <ClInclude Include="..\src\login\loginchrif.h" />
-    <ClInclude Include="..\src\login\loginclif.h" />
-    <ClInclude Include="..\src\login\logincnslif.h" />
-    <ClInclude Include="..\src\login\loginlog.h" />
     <ClInclude Include="..\src\common\cbasetypes.h" />
     <ClInclude Include="..\src\common\core.h" />
     <ClInclude Include="..\src\common\conf.h" />
@@ -172,7 +166,14 @@
     <ClInclude Include="..\src\common\utils.h" />
     <ClInclude Include="..\src\common\cli.h" />
     <ClInclude Include="..\src\common\msg_conf.h" />
-    <ClInclude Include="..\3rdparty\mt19937ar\mt19937ar.h" />
+    <ClInclude Include="..\src\config\core.h" />
+    <ClInclude Include="..\src\login\account.h" />
+    <ClInclude Include="..\src\login\ipban.h" />
+    <ClInclude Include="..\src\login\login.h" />
+    <ClInclude Include="..\src\login\loginchrif.h" />
+    <ClInclude Include="..\src\login\loginclif.h" />
+    <ClInclude Include="..\src\login\logincnslif.h" />
+    <ClInclude Include="..\src\login\loginlog.h" />
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\3rdparty\libconfig\grammar.c" />
@@ -180,17 +181,11 @@
     <ClCompile Include="..\3rdparty\libconfig\scanctx.c" />
     <ClCompile Include="..\3rdparty\libconfig\scanner.c" />
     <ClCompile Include="..\3rdparty\libconfig\strbuf.c" />
+    <ClCompile Include="..\3rdparty\mt19937ar\mt19937ar.c" />
     <ClCompile Include="..\src\common\mempool.c" />
     <ClCompile Include="..\src\common\mutex.c" />
     <ClCompile Include="..\src\common\raconf.c" />
     <ClCompile Include="..\src\common\thread.c" />
-    <ClCompile Include="..\src\login\account.c" />
-    <ClCompile Include="..\src\login\ipban.c" />
-    <ClCompile Include="..\src\login\login.c" />
-    <ClCompile Include="..\src\login\loginchrif.c" />
-    <ClCompile Include="..\src\login\loginclif.c" />
-    <ClCompile Include="..\src\login\logincnslif.c" />
-    <ClCompile Include="..\src\login\loginlog.c" />
     <ClCompile Include="..\src\common\core.c" />
     <ClCompile Include="..\src\common\conf.c" />
     <ClCompile Include="..\src\common\db.c" />
@@ -207,7 +202,13 @@
     <ClCompile Include="..\src\common\utils.c" />
     <ClCompile Include="..\src\common\cli.c" />
     <ClCompile Include="..\src\common\msg_conf.c" />
-    <ClCompile Include="..\3rdparty\mt19937ar\mt19937ar.c" />
+    <ClCompile Include="..\src\login\account.c" />
+    <ClCompile Include="..\src\login\ipban.c" />
+    <ClCompile Include="..\src\login\login.c" />
+    <ClCompile Include="..\src\login\loginchrif.c" />
+    <ClCompile Include="..\src\login\loginclif.c" />
+    <ClCompile Include="..\src\login\logincnslif.c" />
+    <ClCompile Include="..\src\login\loginlog.c" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">

vcproj-13/login-server.vcxproj.filters

@@ -22,6 +22,9 @@
     <ClCompile Include="..\src\login\loginlog.c">
       <Filter>login</Filter>
     </ClCompile>
+    <ClCompile Include="..\src\common\cli.c">
+      <Filter>common</Filter>
+    </ClCompile>
     <ClCompile Include="..\src\common\core.c">
       <Filter>common</Filter>
     </ClCompile>
@@ -64,6 +67,21 @@
     <ClCompile Include="..\src\common\utils.c">
       <Filter>common</Filter>
     </ClCompile>
+    <ClCompile Include="..\src\common\thread.c">
+      <Filter>common</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\common\mutex.c">
+      <Filter>common</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\common\mempool.c">
+      <Filter>common</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\common\msg_conf.c">
+      <Filter>common</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\common\raconf.c">
+      <Filter>common</Filter>
+    </ClCompile>
     <ClCompile Include="..\3rdparty\mt19937ar\mt19937ar.c">
       <Filter>3rdparty\mt19937ar</Filter>
     </ClCompile>
@@ -82,20 +100,6 @@
     <ClCompile Include="..\3rdparty\libconfig\strbuf.c">
       <Filter>3rdparty\libconfig</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\common\thread.c">
-      <Filter>common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\common\mutex.c">
-      <Filter>common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\common\mempool.c">
-      <Filter>common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\common\raconf.c">
-      <Filter>common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\common\cli.c" />
-    <ClCompile Include="..\src\common\msg_conf.c" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\src\login\account.h">
@@ -125,6 +129,9 @@
     <ClInclude Include="..\src\common\core.h">
       <Filter>common</Filter>
     </ClInclude>
+    <ClInclude Include="..\src\common\cli.h">
+      <Filter>common</Filter>
+    </ClInclude>
     <ClInclude Include="..\src\common\conf.h">
       <Filter>common</Filter>
     </ClInclude>
@@ -167,6 +174,24 @@
     <ClInclude Include="..\src\common\utils.h">
       <Filter>common</Filter>
     </ClInclude>
+    <ClInclude Include="..\src\common\winapi.h">
+      <Filter>common</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\common\thread.h">
+      <Filter>common</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\common\mutex.h">
+      <Filter>common</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\common\mempool.h">
+      <Filter>common</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\common\msg_conf.h">
+      <Filter>common</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\common\raconf.h">
+      <Filter>common</Filter>
+    </ClInclude>
     <ClInclude Include="..\3rdparty\mt19937ar\mt19937ar.h">
       <Filter>3rdparty\mt19937ar</Filter>
     </ClInclude>
@@ -191,23 +216,9 @@
     <ClInclude Include="..\3rdparty\libconfig\wincompat.h">
       <Filter>3rdparty\libconfig</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\common\winapi.h">
-      <Filter>common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\common\thread.h">
-      <Filter>common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\common\mutex.h">
-      <Filter>common</Filter>
+    <ClInclude Include="..\src\config\core.h">
+      <Filter>config</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\common\mempool.h">
-      <Filter>common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\common\raconf.h">
-      <Filter>common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\common\cli.h" />
-    <ClInclude Include="..\src\common\msg_conf.h" />
   </ItemGroup>
   <ItemGroup>
     <Filter Include="common">
@@ -225,5 +236,8 @@
     <Filter Include="3rdparty\libconfig">
       <UniqueIdentifier>{779e8145-9bb2-4a88-9149-60586ab0bdd4}</UniqueIdentifier>
     </Filter>
+    <Filter Include="config">
+      <UniqueIdentifier>{9aa58d37-a3b4-436e-94f2-3776f379251a}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
 </Project>

vcproj-13/map-server.vcxproj.filters

@@ -369,11 +369,6 @@
     <ClInclude Include="..\src\common\utils.h">
       <Filter>common</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\config\const.h" />
-    <ClInclude Include="..\src\config\core.h" />
-    <ClInclude Include="..\src\config\renewal.h" />
-    <ClInclude Include="..\src\config\secure.h" />
-    <ClInclude Include="..\src\config\classes\general.h" />
     <ClInclude Include="..\src\common\conf.h">
       <Filter>common</Filter>
     </ClInclude>
@@ -428,6 +423,21 @@
     <ClInclude Include="..\src\common\msg_conf.h">
 		<Filter>common</Filter>
     </ClInclude>
+    <ClInclude Include="..\src\config\secure.h">
+      <Filter>config</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\config\const.h">
+      <Filter>config</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\config\core.h">
+      <Filter>config</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\config\renewal.h">
+      <Filter>config</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\config\classes\general.h">
+      <Filter>config\classes</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <Filter Include="common">
@@ -445,5 +455,11 @@
     <Filter Include="3rdparty\libconfig">
       <UniqueIdentifier>{9caf40b7-c4d1-43b4-bd1f-0376b4f920e7}</UniqueIdentifier>
     </Filter>
+    <Filter Include="config">
+      <UniqueIdentifier>{3308d722-72ef-4a4c-a7aa-892d173c8ea3}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="config\classes">
+      <UniqueIdentifier>{dc4ce819-c8e2-4c38-b929-5a57d01e6657}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
 </Project>

vcproj-13/mapcache.vcxproj.filters

@@ -57,7 +57,9 @@
     <ClInclude Include="..\src\common\winapi.h">
       <Filter>common</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\config\renewal.h" />
+    <ClInclude Include="..\src\config\renewal.h">
+      <Filter>config</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <Filter Include="common">
@@ -66,5 +68,8 @@
     <Filter Include="mapcache">
       <UniqueIdentifier>{5ea9d6f7-0a10-4bfb-ad39-478e4b1d8a0d}</UniqueIdentifier>
     </Filter>
+    <Filter Include="config">
+      <UniqueIdentifier>{8ccd627c-fbb0-4bd1-bb96-a95bffa1dd8d}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
-</Project>
+</Project>