Mirroristas/rathena
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

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

Signed-off-by: Cydh Ramdh <house.bad@gmail.com>
This commit is contained in:
Cydh Ramdh 2014-06-05 17:56:22 +07:00
parent 6b9ec5fe0b
commit f5ef82e44a
9 changed files with 134 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/char/char_clif.c
View File

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

2
src/map/atcommand.c
View File

@ -978,7 +978,7 @@ ACMD_FUNC(hide)
// increment the number of pvp players on the map // increment the number of pvp players on the map
map[sd->bl.m].users_pvp++; 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 {// register the player for ranking calculations
sd->pvp_timer = add_timer( gettick() + 200, pc_calc_pvprank_timer, sd->bl.id, 0 ); sd->pvp_timer = add_timer( gettick() + 200, pc_calc_pvprank_timer, sd->bl.id, 0 );
} }

8
vcproj-10/char-server_sql.vcxproj
View File

@ -160,6 +160,10 @@
<ClInclude Include="..\src\common\msg_conf.h" /> <ClInclude Include="..\src\common\msg_conf.h" />
<ClInclude Include="..\src\common\cli.h" /> <ClInclude Include="..\src\common\cli.h" />
<ClInclude Include="..\src\char\char.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_auction.h" />
<ClInclude Include="..\src\char\int_elemental.h" /> <ClInclude Include="..\src\char\int_elemental.h" />
<ClInclude Include="..\src\char\int_guild.h" /> <ClInclude Include="..\src\char\int_guild.h" />
@ -201,6 +205,10 @@
<ClCompile Include="..\src\common\msg_conf.c" /> <ClCompile Include="..\src\common\msg_conf.c" />
<ClCompile Include="..\src\common\cli.c" /> <ClCompile Include="..\src\common\cli.c" />
<ClCompile Include="..\src\char\char.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_auction.c" />
<ClCompile Include="..\src\char\int_elemental.c" /> <ClCompile Include="..\src\char\int_elemental.c" />
<ClCompile Include="..\src\char\int_guild.c" /> <ClCompile Include="..\src\char\int_guild.c" />

24
vcproj-10/char-server_sql.vcxproj.filters
View File

@ -43,6 +43,18 @@
<ClCompile Include="..\src\char\char.c"> <ClCompile Include="..\src\char\char.c">
<Filter>char_sql</Filter> <Filter>char_sql</Filter>
</ClCompile> </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"> <ClCompile Include="..\src\char\int_auction.c">
<Filter>char_sql</Filter> <Filter>char_sql</Filter>
</ClCompile> </ClCompile>
@ -164,6 +176,18 @@
<ClInclude Include="..\src\char\char.h"> <ClInclude Include="..\src\char\char.h">
<Filter>char_sql</Filter> <Filter>char_sql</Filter>
</ClInclude> </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"> <ClInclude Include="..\src\char\int_auction.h">
<Filter>char_sql</Filter> <Filter>char_sql</Filter>
</ClInclude> </ClInclude>

8
vcproj-12/char-server_sql.vcxproj
View File

@ -163,6 +163,10 @@
<ClInclude Include="..\src\common\cli.h" /> <ClInclude Include="..\src\common\cli.h" />
<ClInclude Include="..\src\common\msg_conf.h" /> <ClInclude Include="..\src\common\msg_conf.h" />
<ClInclude Include="..\src\char\char.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_auction.h" />
<ClInclude Include="..\src\char\int_elemental.h" /> <ClInclude Include="..\src\char\int_elemental.h" />
<ClInclude Include="..\src\char\int_guild.h" /> <ClInclude Include="..\src\char\int_guild.h" />
@ -204,6 +208,10 @@
<ClCompile Include="..\src\common\cli.c" /> <ClCompile Include="..\src\common\cli.c" />
<ClCompile Include="..\src\common\msg_conf.c" /> <ClCompile Include="..\src\common\msg_conf.c" />
<ClCompile Include="..\src\char\char.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_auction.c" />
<ClCompile Include="..\src\char\int_elemental.c" /> <ClCompile Include="..\src\char\int_elemental.c" />
<ClCompile Include="..\src\char\int_guild.c" /> <ClCompile Include="..\src\char\int_guild.c" />

24
vcproj-12/char-server_sql.vcxproj.filters
View File

@ -46,6 +46,18 @@
<ClCompile Include="..\src\char\char.c"> <ClCompile Include="..\src\char\char.c">
<Filter>char_sql</Filter> <Filter>char_sql</Filter>
</ClCompile> </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"> <ClCompile Include="..\src\char\int_auction.c">
<Filter>char_sql</Filter> <Filter>char_sql</Filter>
</ClCompile> </ClCompile>
@ -165,6 +177,18 @@
<ClInclude Include="..\src\char\char.h"> <ClInclude Include="..\src\char\char.h">
<Filter>char_sql</Filter> <Filter>char_sql</Filter>
</ClInclude> </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"> <ClInclude Include="..\src\char\int_auction.h">
<Filter>char_sql</Filter> <Filter>char_sql</Filter>
</ClInclude> </ClInclude>

10
vcproj-13/char-server_sql.vcxproj
View File

@ -162,6 +162,10 @@
<ClInclude Include="..\src\common\cli.h" /> <ClInclude Include="..\src\common\cli.h" />
<ClInclude Include="..\src\common\msg_conf.h" /> <ClInclude Include="..\src\common\msg_conf.h" />
<ClInclude Include="..\src\char\char.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_auction.h" />
<ClInclude Include="..\src\char\int_elemental.h" /> <ClInclude Include="..\src\char\int_elemental.h" />
<ClInclude Include="..\src\char\int_guild.h" /> <ClInclude Include="..\src\char\int_guild.h" />
@ -203,6 +207,10 @@
<ClCompile Include="..\src\common\cli.c" /> <ClCompile Include="..\src\common\cli.c" />
<ClCompile Include="..\src\common\msg_conf.c" /> <ClCompile Include="..\src\common\msg_conf.c" />
<ClCompile Include="..\src\char\char.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_auction.c" />
<ClCompile Include="..\src\char\int_elemental.c" /> <ClCompile Include="..\src\char\int_elemental.c" />
<ClCompile Include="..\src\char\int_guild.c" /> <ClCompile Include="..\src\char\int_guild.c" />
@ -218,4 +226,4 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets"> <ImportGroup Label="ExtensionTargets">
</ImportGroup> </ImportGroup>
</Project> </Project>

26
vcproj-13/char-server_sql.vcxproj.filters
View File

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

32
vcproj-9/char-server_sql.vcproj
View File

@ -456,6 +456,38 @@
RelativePath="..\src\char\char.h" RelativePath="..\src\char\char.h"
> >
</File> </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 <File
RelativePath="..\src\char\int_auction.c" RelativePath="..\src\char\int_auction.c"
> >