diff options
| author | shennetsind <shennetsind@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2012-03-28 04:39:54 +0000 |
|---|---|---|
| committer | shennetsind <shennetsind@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2012-03-28 04:39:54 +0000 |
| commit | baabe7950fb4957e8d6fdc9159058eb2fef4c198 (patch) | |
| tree | e4c7780744d16ea974fdd5468536acf3d851926f /src/map/script.c | |
| parent | 0fcebf1d6be27d213aecbf3af841db25779e9057 (diff) | |
| download | hercules-baabe7950fb4957e8d6fdc9159058eb2fef4c198.tar.gz hercules-baabe7950fb4957e8d6fdc9159058eb2fef4c198.tar.bz2 hercules-baabe7950fb4957e8d6fdc9159058eb2fef4c198.tar.xz hercules-baabe7950fb4957e8d6fdc9159058eb2fef4c198.zip | |
Fixed bugreport:5497, LK/RG/PD/RG new mounts are now available again to clients prior to november 2011, items with delayed consumption are no longer available to users in new mount state. Updated setoption to consider pc_cant_mount and remove OPTION_MOUNTING from the opt bundle
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@15808 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/script.c')
| -rw-r--r-- | src/map/script.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/map/script.c b/src/map/script.c index 897575a30..6504c41cb 100644 --- a/src/map/script.c +++ b/src/map/script.c @@ -7473,6 +7473,8 @@ BUILDIN_FUNC(setoption) if( flag ){// Add option if( option&OPTION_WEDDING && !battle_config.wedding_modifydisplay ) option &= ~OPTION_WEDDING;// Do not show the wedding sprites + else if ( option&OPTION_MOUNTING && pc_cant_newmount(sd) ) + option &= ~OPTION_MOUNTING; pc_setoption(sd, sd->sc.option|option); } else// Remove option pc_setoption(sd, sd->sc.option&~option); @@ -15798,7 +15800,7 @@ BUILDIN_FUNC(setmounting) { TBL_PC* sd; if( (sd = script_rid2sd(st)) == NULL ) return 0; - if( sd->sc.option&(OPTION_WUGRIDER|OPTION_RIDING|OPTION_DRAGON|OPTION_MADOGEAR) ) + if( sd->sc.option&(OPTION_WUGRIDER|OPTION_RIDING|OPTION_DRAGON|OPTION_MADOGEAR) || pc_cant_newmount(sd) ) script_pushint(st,0);//can't mount with one of these else { if( sd->sc.option&OPTION_MOUNTING ) |