diff options
| author | shennetsind <shennetsind@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2012-02-17 17:01:37 +0000 |
|---|---|---|
| committer | shennetsind <shennetsind@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2012-02-17 17:01:37 +0000 |
| commit | 21e32863d3f486d48bfee8c2b859fe811f671437 (patch) | |
| tree | 4cef9efa6efa0359c7d8b30d630c63464332f0a4 /src/map | |
| parent | eb54661901e395d01995364f9c63b67be68f3bc7 (diff) | |
| download | hercules-21e32863d3f486d48bfee8c2b859fe811f671437.tar.gz hercules-21e32863d3f486d48bfee8c2b859fe811f671437.tar.bz2 hercules-21e32863d3f486d48bfee8c2b859fe811f671437.tar.xz hercules-21e32863d3f486d48bfee8c2b859fe811f671437.zip | |
Added Wildcard's fix for @hide gms on @pvp'd pvp maps
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@15596 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map')
| -rw-r--r-- | src/map/atcommand.c | 26 |
1 files changed, 11 insertions, 15 deletions
diff --git a/src/map/atcommand.c b/src/map/atcommand.c index 1f2a82ba6..7899be131 100644 --- a/src/map/atcommand.c +++ b/src/map/atcommand.c @@ -896,14 +896,12 @@ ACMD_FUNC(hide) status_set_viewdata(&sd->bl, sd->status.class_); clif_displaymessage(fd, msg_txt(10)); // Invisible: Off - if( map[sd->bl.m].flag.pvp ) - {// increment the number of pvp players on the map - map[sd->bl.m].users_pvp++; + // increment the number of pvp players on the map + map[sd->bl.m].users_pvp++; - if( !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 ); - } + if( 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 ); } //bugreport:2266 map_foreachinmovearea(clif_insight, &sd->bl, AREA_SIZE, sd->bl.x, sd->bl.y, BL_ALL, &sd->bl); @@ -912,15 +910,13 @@ ACMD_FUNC(hide) sd->vd.class_ = INVISIBLE_CLASS; clif_displaymessage(fd, msg_txt(11)); // Invisible: On - if( map[sd->bl.m].flag.pvp ) - {// decrement the number of pvp players on the map - map[sd->bl.m].users_pvp--; + // decrement the number of pvp players on the map + map[sd->bl.m].users_pvp--; - if( !map[sd->bl.m].flag.pvp_nocalcrank && sd->pvp_timer != INVALID_TIMER ) - {// unregister the player for ranking - delete_timer( sd->pvp_timer, pc_calc_pvprank_timer ); - sd->pvp_timer = INVALID_TIMER; - } + if( map[sd->bl.m].flag.pvp && !map[sd->bl.m].flag.pvp_nocalcrank && sd->pvp_timer != INVALID_TIMER ) + {// unregister the player for ranking + delete_timer( sd->pvp_timer, pc_calc_pvprank_timer ); + sd->pvp_timer = INVALID_TIMER; } } clif_changeoption(&sd->bl); |