* Follow up 6b9ec5f, added new files to MSVS filters

* Fixed PVP Timer that shown in PK Mode after @hide (bugreport:6036)

Signed-off-by: Cydh Ramdh <house.bad@gmail.com>

src/char/char_clif.c

@@ -949,8 +949,9 @@ int chclif_parse_reqrename(int fd, struct char_session_data* sd, int cmd){
             RFIFOSKIP(fd,30);
     }
     else if(cmd == 0x28d) {
-            FIFOSD_CHECK(34)
-            int aid = RFIFOL(fd,2);
+            int aid;
+            FIFOSD_CHECK(34);
+            aid = RFIFOL(fd,2);
             cid =RFIFOL(fd,6);
             safestrncpy(name, (char *)RFIFOP(fd,10), NAME_LENGTH);
             RFIFOSKIP(fd,34);

src/map/atcommand.c

@@ -978,7 +978,7 @@ ACMD_FUNC(hide)
 		// increment the number of pvp players on the map
 		map[sd->bl.m].users_pvp++;
 
-		if( map[sd->bl.m].flag.pvp && !map[sd->bl.m].flag.pvp_nocalcrank )
+		if( !battle_config.pk_mode && map[sd->bl.m].flag.pvp && !map[sd->bl.m].flag.pvp_nocalcrank )
 		{// register the player for ranking calculations
 			sd->pvp_timer = add_timer( gettick() + 200, pc_calc_pvprank_timer, sd->bl.id, 0 );
 		}

vcproj-10/char-server_sql.vcxproj

@@ -160,6 +160,10 @@
     <ClInclude Include="..\src\common\msg_conf.h" />
     <ClInclude Include="..\src\common\cli.h" />
     <ClInclude Include="..\src\char\char.h" />
+    <ClInclude Include="..\src\char\char_clif.h" />
+    <ClInclude Include="..\src\char\char_cnslif.h" />
+    <ClInclude Include="..\src\char\char_logif.h" />
+    <ClInclude Include="..\src\char\char_mapif.h" />
     <ClInclude Include="..\src\char\int_auction.h" />
     <ClInclude Include="..\src\char\int_elemental.h" />
     <ClInclude Include="..\src\char\int_guild.h" />
@@ -201,6 +205,10 @@
     <ClCompile Include="..\src\common\msg_conf.c" />
     <ClCompile Include="..\src\common\cli.c" />
     <ClCompile Include="..\src\char\char.c" />
+    <ClCompile Include="..\src\char\char_clif.c" />
+    <ClCompile Include="..\src\char\char_cnslif.c" />
+    <ClCompile Include="..\src\char\char_logif.c" />
+    <ClCompile Include="..\src\char\char_mapif.c" />
     <ClCompile Include="..\src\char\int_auction.c" />
     <ClCompile Include="..\src\char\int_elemental.c" />
     <ClCompile Include="..\src\char\int_guild.c" />

vcproj-10/char-server_sql.vcxproj.filters

@@ -43,6 +43,18 @@
     <ClCompile Include="..\src\char\char.c">
       <Filter>char_sql</Filter>
     </ClCompile>
+    <ClCompile Include="..\src\char\char_clif.c">
+      <Filter>char_sql</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\char\char_cnslif.c">
+      <Filter>char_sql</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\char\char_logif.c">
+      <Filter>char_sql</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\char\char_mapif.c">
+      <Filter>char_sql</Filter>
+    </ClCompile>
     <ClCompile Include="..\src\char\int_auction.c">
       <Filter>char_sql</Filter>
     </ClCompile>
@@ -164,6 +176,18 @@
     <ClInclude Include="..\src\char\char.h">
       <Filter>char_sql</Filter>
     </ClInclude>
+    <ClInclude Include="..\src\char\char_clif.h">
+      <Filter>char_sql</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\char\char_cnslif.h">
+      <Filter>char_sql</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\char\char_logif.h">
+      <Filter>char_sql</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\char\char_mapif.h">
+      <Filter>char_sql</Filter>
+    </ClInclude>
     <ClInclude Include="..\src\char\int_auction.h">
       <Filter>char_sql</Filter>
     </ClInclude>

vcproj-12/char-server_sql.vcxproj

@@ -163,6 +163,10 @@
     <ClInclude Include="..\src\common\cli.h" />
     <ClInclude Include="..\src\common\msg_conf.h" />
     <ClInclude Include="..\src\char\char.h" />
+    <ClInclude Include="..\src\char\char_clif.h" />
+    <ClInclude Include="..\src\char\char_cnslif.h" />
+    <ClInclude Include="..\src\char\char_logif.h" />
+    <ClInclude Include="..\src\char\char_mapif.h" />
     <ClInclude Include="..\src\char\int_auction.h" />
     <ClInclude Include="..\src\char\int_elemental.h" />
     <ClInclude Include="..\src\char\int_guild.h" />
@@ -204,6 +208,10 @@
     <ClCompile Include="..\src\common\cli.c" />
     <ClCompile Include="..\src\common\msg_conf.c" />
     <ClCompile Include="..\src\char\char.c" />
+    <ClCompile Include="..\src\char\char_clif.c" />
+    <ClCompile Include="..\src\char\char_cnslif.c" />
+    <ClCompile Include="..\src\char\char_logif.c" />
+    <ClCompile Include="..\src\char\char_mapif.c" />
     <ClCompile Include="..\src\char\int_auction.c" />
     <ClCompile Include="..\src\char\int_elemental.c" />
     <ClCompile Include="..\src\char\int_guild.c" />

vcproj-12/char-server_sql.vcxproj.filters

@@ -46,6 +46,18 @@
     <ClCompile Include="..\src\char\char.c">
       <Filter>char_sql</Filter>
     </ClCompile>
+    <ClCompile Include="..\src\char\char_clif.c">
+      <Filter>char_sql</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\char\char_cnslif.c">
+      <Filter>char_sql</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\char\char_logif.c">
+      <Filter>char_sql</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\char\char_mapif.c">
+      <Filter>char_sql</Filter>
+    </ClCompile>
     <ClCompile Include="..\src\char\int_auction.c">
       <Filter>char_sql</Filter>
     </ClCompile>
@@ -165,6 +177,18 @@
     <ClInclude Include="..\src\char\char.h">
       <Filter>char_sql</Filter>
     </ClInclude>
+    <ClInclude Include="..\src\char\char_clif.h">
+      <Filter>char_sql</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\char\char_cnslif.h">
+      <Filter>char_sql</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\char\char_logif.h">
+      <Filter>char_sql</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\char\char_mapif.h">
+      <Filter>char_sql</Filter>
+    </ClInclude>
     <ClInclude Include="..\src\char\int_auction.h">
       <Filter>char_sql</Filter>
     </ClInclude>

vcproj-13/char-server_sql.vcxproj

@@ -162,6 +162,10 @@
     <ClInclude Include="..\src\common\cli.h" />
     <ClInclude Include="..\src\common\msg_conf.h" />
     <ClInclude Include="..\src\char\char.h" />
+    <ClInclude Include="..\src\char\char_clif.h" />
+    <ClInclude Include="..\src\char\char_cnslif.h" />
+    <ClInclude Include="..\src\char\char_logif.h" />
+    <ClInclude Include="..\src\char\char_mapif.h" />
     <ClInclude Include="..\src\char\int_auction.h" />
     <ClInclude Include="..\src\char\int_elemental.h" />
     <ClInclude Include="..\src\char\int_guild.h" />
@@ -203,6 +207,10 @@
     <ClCompile Include="..\src\common\cli.c" />
     <ClCompile Include="..\src\common\msg_conf.c" />
     <ClCompile Include="..\src\char\char.c" />
+    <ClCompile Include="..\src\char\char_clif.c" />
+    <ClCompile Include="..\src\char\char_cnslif.c" />
+    <ClCompile Include="..\src\char\char_logif.c" />
+    <ClCompile Include="..\src\char\char_mapif.c" />
     <ClCompile Include="..\src\char\int_auction.c" />
     <ClCompile Include="..\src\char\int_elemental.c" />
     <ClCompile Include="..\src\char\int_guild.c" />
@@ -218,4 +226,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>

vcproj-13/char-server_sql.vcxproj.filters

@@ -46,6 +46,18 @@
     <ClCompile Include="..\src\char\char.c">
       <Filter>char_sql</Filter>
     </ClCompile>
+    <ClCompile Include="..\src\char\char_clif.c">
+      <Filter>char_sql</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\char\char_cnslif.c">
+      <Filter>char_sql</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\char\char_logif.c">
+      <Filter>char_sql</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\char\char_mapif.c">
+      <Filter>char_sql</Filter>
+    </ClCompile>
     <ClCompile Include="..\src\char\int_auction.c">
       <Filter>char_sql</Filter>
     </ClCompile>
@@ -167,6 +179,18 @@
     <ClInclude Include="..\src\char\char.h">
       <Filter>char_sql</Filter>
     </ClInclude>
+    <ClInclude Include="..\src\char\char_clif.h">
+      <Filter>char_sql</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\char\char_cnslif.h">
+      <Filter>char_sql</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\char\char_logif.h">
+      <Filter>char_sql</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\char\char_mapif.h">
+      <Filter>char_sql</Filter>
+    </ClInclude>
     <ClInclude Include="..\src\char\int_auction.h">
       <Filter>char_sql</Filter>
     </ClInclude>
@@ -256,4 +280,4 @@
       <UniqueIdentifier>{9e8badd7-548f-4eb4-9e87-613e87e772ff}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
-</Project>
+</Project>

vcproj-9/char-server_sql.vcproj

@@ -456,6 +456,38 @@
 				RelativePath="..\src\char\char.h"
 				>
 			</File>
+			<File
+				RelativePath="..\src\char\char_clif.c"
+				>
+			</File>
+			<File
+				RelativePath="..\src\char\char_clif.h"
+				>
+			</File>
+			<File
+				RelativePath="..\src\char\char_cnslif.c"
+				>
+			</File>
+			<File
+				RelativePath="..\src\char\char_cnslif.h"
+				>
+			</File>
+			<File
+				RelativePath="..\src\char\char_logif.c"
+				>
+			</File>
+			<File
+				RelativePath="..\src\char\char_logif.h"
+				>
+			</File>
+			<File
+				RelativePath="..\src\char\char_mapif.c"
+				>
+			</File>
+			<File
+				RelativePath="..\src\char\char_mapif.h"
+				>
+			</File>
 			<File
 				RelativePath="..\src\char\int_auction.c"
 				>