diff options
| author | Jedzkie <jedzkie13@rocketmail.com> | 2017-04-18 16:05:44 +0800 |
|---|---|---|
| committer | Jedzkie <jedzkie13@rocketmail.com> | 2017-04-21 01:15:16 +0800 |
| commit | 018f3c4278351017b5eb727c0007d69303a53bf5 (patch) | |
| tree | 0d0e0714a6031de8da441b7bfd327efda8901bd1 | |
| parent | b1fdb0176241759a3085ad8b4d5bf415d3392f03 (diff) | |
| download | hercules-018f3c4278351017b5eb727c0007d69303a53bf5.tar.gz hercules-018f3c4278351017b5eb727c0007d69303a53bf5.tar.bz2 hercules-018f3c4278351017b5eb727c0007d69303a53bf5.tar.xz hercules-018f3c4278351017b5eb727c0007d69303a53bf5.zip | |
Removed hard coded checks for no use while sitting in Aloevera and Anodyne item.
| -rw-r--r-- | db/pre-re/item_db.conf | 6 | ||||
| -rw-r--r-- | db/re/item_db.conf | 6 | ||||
| -rw-r--r-- | src/map/pc.c | 6 |
3 files changed, 13 insertions, 5 deletions
diff --git a/db/pre-re/item_db.conf b/db/pre-re/item_db.conf index a681d5753..dbcfe61e7 100644 --- a/db/pre-re/item_db.conf +++ b/db/pre-re/item_db.conf @@ -1197,6 +1197,9 @@ item_db: ( Buy: 2000 Weight: 100 BuyingStore: true + Nouse: { + sitting: true + } Script: <" itemskill SM_ENDURE,1; "> }, { @@ -1207,6 +1210,9 @@ item_db: ( Buy: 1500 Weight: 100 BuyingStore: true + Nouse: { + sitting: true + } Script: <" itemskill SM_SELFPROVOKE,1; "> }, { diff --git a/db/re/item_db.conf b/db/re/item_db.conf index ca826e58d..74740e693 100644 --- a/db/re/item_db.conf +++ b/db/re/item_db.conf @@ -1218,6 +1218,9 @@ item_db: ( Buy: 2000 Weight: 100 BuyingStore: true + Nouse: { + sitting: true + } Script: <" itemskill SM_ENDURE,1; "> }, { @@ -1228,6 +1231,9 @@ item_db: ( Buy: 1500 Weight: 100 BuyingStore: true + Nouse: { + sitting: true + } Script: <" itemskill SM_SELFPROVOKE,1; "> }, { diff --git a/src/map/pc.c b/src/map/pc.c index e9855c16d..0dde3cd9e 100644 --- a/src/map/pc.c +++ b/src/map/pc.c @@ -4840,11 +4840,7 @@ int pc_isUseitem(struct map_session_data *sd,int n) switch( nameid ) { // TODO: Is there no better way to handle this, other than hardcoding item IDs? case ITEMID_ANODYNE: - if( map_flag_gvg2(sd->bl.m) ) - return 0; - /* Fall through */ - case ITEMID_ALOEBERA: - if( pc_issit(sd) ) + if (map_flag_gvg2(sd->bl.m)) return 0; break; case ITEMID_WING_OF_FLY: |