summaryrefslogtreecommitdiff
path: root/src/map/status.c
diff options
context:
space:
mode:
authorskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-05-08 17:33:24 +0000
committerskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-05-08 17:33:24 +0000
commit62cf686313c8c25a3c78e67b82917fd56fa6e2a6 (patch)
treec26a1a6c395a8c424c4c1c29c8085f30e70e8900 /src/map/status.c
parent3f355729f457c4138f78a71c5019a208f2597e3c (diff)
downloadhercules-62cf686313c8c25a3c78e67b82917fd56fa6e2a6.tar.gz
hercules-62cf686313c8c25a3c78e67b82917fd56fa6e2a6.tar.bz2
hercules-62cf686313c8c25a3c78e67b82917fd56fa6e2a6.tar.xz
hercules-62cf686313c8c25a3c78e67b82917fd56fa6e2a6.zip
- Increased max number of tries to find a random spot in maps to 1000 since some maps have so many non-walkable tiles it's hard to find one in just 100 tries.
- Reduced Stun duration of multiple skills to 3 secs. Skills affected: Meteor Storm, Land Mine, Bash (fatal blow), Throw Stone, NPC_LICK, Raid, shield Charge, Cart Termination. - status_set_viewdata will remove the Wedding Option status when you set a class that is not wedding. - Removed the Job_Novice range check in pcdb_checkid since it's causing warnings when checking versus vd->class_ (and when will we use a negative value class anyway?) git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@6518 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/status.c')
-rw-r--r--src/map/status.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/map/status.c b/src/map/status.c
index 18d10bd0a..74b7422d7 100644
--- a/src/map/status.c
+++ b/src/map/status.c
@@ -3355,10 +3355,10 @@ void status_set_viewdata(struct block_list *bl, int class_)
class_ = JOB_BABY_CRUSADER2;
break;
}
- if (sd->vd.class_ == JOB_WEDDING)
- sd->sc.option&=~OPTION_WEDDING;
if (class_ == JOB_WEDDING)
sd->sc.option|=OPTION_WEDDING;
+ else if (sd->sc.option&OPTION_WEDDING)
+ sd->sc.option&=~OPTION_WEDDING; //If not going to display it, then remove the option.
sd->vd.class_ = class_;
clif_get_weapon_view(sd, &sd->vd.weapon, &sd->vd.shield);
sd->vd.head_top = sd->status.head_top;