diff options
| author | shennetsind <shennetsind@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2012-04-29 20:43:50 +0000 |
|---|---|---|
| committer | shennetsind <shennetsind@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2012-04-29 20:43:50 +0000 |
| commit | cb54f6e503c6160eb5896088f04dcb75860ef153 (patch) | |
| tree | add1dedbf9d1476547ce0f7e7beda0666bdb989a | |
| parent | 354a65564f48113c78f886f9df3329abd8bfd756 (diff) | |
| download | hercules-cb54f6e503c6160eb5896088f04dcb75860ef153.tar.gz hercules-cb54f6e503c6160eb5896088f04dcb75860ef153.tar.bz2 hercules-cb54f6e503c6160eb5896088f04dcb75860ef153.tar.xz hercules-cb54f6e503c6160eb5896088f04dcb75860ef153.zip | |
Fixed bugreport:5668 delayed consumption items are no longer usable while sitting. (temporary measure until we figure what actually broke it)
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16010 54d463be-8e91-2dee-dedb-b68131a5f0ec
| -rw-r--r-- | src/map/pc.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/map/pc.c b/src/map/pc.c index e2994ef97..193c1ab4d 100644 --- a/src/map/pc.c +++ b/src/map/pc.c @@ -4019,9 +4019,12 @@ int pc_useitem(struct map_session_data *sd,int n) nameid = sd->inventory_data[n]->nameid; /* Items with delayed consume are not meant to work while in mounts except reins of mount(12622) */ - if( sd->inventory_data[n]->flag.delay_consume && nameid != 12622 && sd->sc.option&OPTION_MOUNTING ) - return 0; - + if( sd->inventory_data[n]->flag.delay_consume ) { + if( nameid != 12622 && sd->sc.option&OPTION_MOUNTING ) + return 0; + else if( pc_issit(sd) ) + return 0; + } //Since most delay-consume items involve using a "skill-type" target cursor, //perform a skill-use check before going through. [Skotlex] //resurrection was picked as testing skill, as a non-offensive, generic skill, it will do. |