diff options
| author | ultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2007-10-18 21:25:26 +0000 |
|---|---|---|
| committer | ultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2007-10-18 21:25:26 +0000 |
| commit | 2bc59ef9db7a86d0c483e3848ead57d6d691e6a3 (patch) | |
| tree | dfe7994053b5e2d0a1aad158ca23f0cc8e0bc533 /src/map/pc.c | |
| parent | ea3c690441b4f4c6cea3fd556ac0618018be9a23 (diff) | |
| download | hercules-2bc59ef9db7a86d0c483e3848ead57d6d691e6a3.tar.gz hercules-2bc59ef9db7a86d0c483e3848ead57d6d691e6a3.tar.bz2 hercules-2bc59ef9db7a86d0c483e3848ead57d6d691e6a3.tar.xz hercules-2bc59ef9db7a86d0c483e3848ead57d6d691e6a3.zip | |
Fixed numerous /W4 warnings (and created more :)
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@11514 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/pc.c')
| -rw-r--r-- | src/map/pc.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/map/pc.c b/src/map/pc.c index d259bc6e0..f039f8318 100644 --- a/src/map/pc.c +++ b/src/map/pc.c @@ -3398,7 +3398,7 @@ int pc_steal_coin(struct map_session_data *sd,struct block_list *target) * 2 - Map not in this map-server, and failed to locate alternate map-server. * 3 - Failed to warp player because it was in transition between maps. *------------------------------------------*/ -int pc_setpos(struct map_session_data *sd,unsigned short mapindex,int x,int y,int clrtype) +int pc_setpos(struct map_session_data* sd, unsigned short mapindex, int x, int y, uint8 clrtype) { int m; @@ -6688,11 +6688,9 @@ int pc_calc_pvprank_timer(int tid,unsigned int tick,int id,int data) sd=map_id2sd(id); if(sd==NULL) return 0; - sd->pvp_timer=UINT_MAX; - if( pc_calc_pvprank(sd)>0 ) - sd->pvp_timer=add_timer( - gettick()+PVP_CALCRANK_INTERVAL, - pc_calc_pvprank_timer,id,data); + sd->pvp_timer = -1; + if( pc_calc_pvprank(sd) > 0 ) + sd->pvp_timer = add_timer(gettick()+PVP_CALCRANK_INTERVAL,pc_calc_pvprank_timer,id,data); return 0; } |