diff options
| author | malufett <malufett.eat.my.binaries@gmail.com> | 2013-04-15 01:11:50 +0800 |
|---|---|---|
| committer | malufett <malufett.eat.my.binaries@gmail.com> | 2013-04-15 01:11:50 +0800 |
| commit | 7ba570eabc84865566f4335269f00b3640fa09db (patch) | |
| tree | 10b6519f5ce4a0d4696da594e8e6eedb9eb6e859 /src/map/pc.c | |
| parent | 0446b3c78d8360327a25548004b02549842c523d (diff) | |
| download | hercules-7ba570eabc84865566f4335269f00b3640fa09db.tar.gz hercules-7ba570eabc84865566f4335269f00b3640fa09db.tar.bz2 hercules-7ba570eabc84865566f4335269f00b3640fa09db.tar.xz hercules-7ba570eabc84865566f4335269f00b3640fa09db.zip | |
Fixed Bug #7152 and #7161
-SI_RIDING is not remove when changing job via @jobchange.
-RG_STRIPWEAPON should now only remove right hand weapon even if dual wielding.
-Fixed 'display_status_timers' conf where it doesn't work properly in newer clients.
-Reverted '14a406ee0e5c6ba25539cc98f27ff9c2b8047e2e' where it's already fixed @ 'b9c79ceb5bfc86809da1d3b6154da4222cb72734'.
Signed-off-by: malufett <malufett.eat.my.binaries@gmail.com>
Diffstat (limited to 'src/map/pc.c')
| -rw-r--r-- | src/map/pc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/map/pc.c b/src/map/pc.c index ee9715b6f..01df6bb64 100644 --- a/src/map/pc.c +++ b/src/map/pc.c @@ -6307,7 +6307,7 @@ int pc_resetskill(struct map_session_data* sd, int flag) if( pc_checkskill(sd, SG_DEVIL) && !pc_nextjobexp(sd) ) clif->status_change(&sd->bl, SI_DEVIL, 0, 0, 0, 0, 0); //Remove perma blindness due to skill-reset. [Skotlex] i = sd->sc.option; - if( i&OPTION_RIDING && pc_checkskill(sd, KN_RIDING) ) + if( i&OPTION_RIDING && (!pc_checkskill(sd, KN_RIDING) || (sd->class_&MAPID_THIRDMASK) == MAPID_RUNE_KNIGHT) ) i &= ~OPTION_RIDING; if( i&OPTION_FALCON && pc_checkskill(sd, HT_FALCON) ) i &= ~OPTION_FALCON; @@ -7595,7 +7595,7 @@ int pc_setoption(struct map_session_data *sd,int type) clif->status_change(&sd->bl, SI_RIDING, 1, 0, 0, 0, 0); status_calc_pc(sd,0); } - else if( (!(type&OPTION_RIDING) && p_type&OPTION_RIDING) || (!(type&OPTION_DRAGON) && p_type&OPTION_DRAGON && pc_checkskill(sd,RK_DRAGONTRAINING) > 0) ) + else if( (!(type&OPTION_RIDING) && p_type&OPTION_RIDING) || (!(type&OPTION_DRAGON) && p_type&OPTION_DRAGON) ) { // Dismount clif->status_change(&sd->bl, SI_RIDING, 0, 0, 0, 0, 0); status_calc_pc(sd,0); |