From 0d4639eea94cd4ef972bdfa592366447dd4bdba7 Mon Sep 17 00:00:00 2001 From: shennetsind Date: Sun, 13 May 2012 08:51:43 +0000 Subject: Fixed bugreport:5722 now client "/" commands that use @command functionality will respect the atcommand_symbol config. Special Thanks to Lighta git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16108 54d463be-8e91-2dee-dedb-b68131a5f0ec --- src/map/status.c | 49 +++++++++++++++++++++++-------------------------- 1 file changed, 23 insertions(+), 26 deletions(-) (limited to 'src/map/status.c') diff --git a/src/map/status.c b/src/map/status.c index ddb79e85f..a841e4be4 100644 --- a/src/map/status.c +++ b/src/map/status.c @@ -5476,34 +5476,31 @@ void status_set_viewdata(struct block_list *bl, int class_) if (pcdb_checkid(class_)) { if (sd->sc.option&OPTION_WEDDING) class_ = JOB_WEDDING; - else - if (sd->sc.option&OPTION_SUMMER) + else if (sd->sc.option&OPTION_SUMMER) class_ = JOB_SUMMER; - else - if (sd->sc.option&OPTION_XMAS) + else if (sd->sc.option&OPTION_XMAS) class_ = JOB_XMAS; - else - if (sd->sc.option&OPTION_RIDING) - switch (class_) - { //Adapt class to a Mounted one. - case JOB_KNIGHT: - class_ = JOB_KNIGHT2; - break; - case JOB_CRUSADER: - class_ = JOB_CRUSADER2; - break; - case JOB_LORD_KNIGHT: - class_ = JOB_LORD_KNIGHT2; - break; - case JOB_PALADIN: - class_ = JOB_PALADIN2; - break; - case JOB_BABY_KNIGHT: - class_ = JOB_BABY_KNIGHT2; - break; - case JOB_BABY_CRUSADER: - class_ = JOB_BABY_CRUSADER2; - break; + else if (sd->sc.option&OPTION_RIDING) { + switch (class_) { //Adapt class to a Mounted one. + case JOB_KNIGHT: + class_ = JOB_KNIGHT2; + break; + case JOB_CRUSADER: + class_ = JOB_CRUSADER2; + break; + case JOB_LORD_KNIGHT: + class_ = JOB_LORD_KNIGHT2; + break; + case JOB_PALADIN: + class_ = JOB_PALADIN2; + break; + case JOB_BABY_KNIGHT: + class_ = JOB_BABY_KNIGHT2; + break; + case JOB_BABY_CRUSADER: + class_ = JOB_BABY_CRUSADER2; + break; + } } sd->vd.class_ = class_; clif_get_weapon_view(sd, &sd->vd.weapon, &sd->vd.shield); -- cgit v1.2.3-60-g2f50