summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-06-30 23:55:20 +0000
committerskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-06-30 23:55:20 +0000
commit0d50770af3671bdfc91b7237b7373ebe0b57aa87 (patch)
tree9f50f6f953dc329aab8ef168b729449e09cb026d /src
parentabb0bcf66009f081cc3287213bf861cc1577018f (diff)
downloadhercules-0d50770af3671bdfc91b7237b7373ebe0b57aa87.tar.gz
hercules-0d50770af3671bdfc91b7237b7373ebe0b57aa87.tar.bz2
hercules-0d50770af3671bdfc91b7237b7373ebe0b57aa87.tar.xz
hercules-0d50770af3671bdfc91b7237b7373ebe0b57aa87.zip
- Removed the check to prevent equipped items from being traded as pc_delitem will take care of unequipping it on trade.
- Added a missing abort when the arrow's script re-calls status_calc_pc git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@7436 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src')
-rw-r--r--src/map/status.c2
-rw-r--r--src/map/trade.c3
2 files changed, 2 insertions, 3 deletions
diff --git a/src/map/status.c b/src/map/status.c
index bec04d668..f59375c69 100644
--- a/src/map/status.c
+++ b/src/map/status.c
@@ -1702,6 +1702,8 @@ int status_calc_pc(struct map_session_data* sd,int first)
sd->state.lr_flag = 2;
run_script(sd->inventory_data[index]->script,0,sd->bl.id,0);
sd->state.lr_flag = 0;
+ if (!calculating) //Abort, run_script retriggered status_calc_pc. [Skotlex]
+ return 1;
sd->arrow_atk += sd->inventory_data[index]->atk;
}
}
diff --git a/src/map/trade.c b/src/map/trade.c
index 1e0486356..b9c142332 100644
--- a/src/map/trade.c
+++ b/src/map/trade.c
@@ -324,9 +324,6 @@ void trade_tradeadditem(struct map_session_data *sd, int index, int amount) {
if (amount < 0 || amount > sd->status.inventory[index].amount)
return;
- if (sd->status.inventory[index].equip)
- return; //must not be able to trade equipped items.
-
nameid = sd->inventory_data[index]->nameid;
if (!itemdb_cantrade(nameid, pc_isGM(sd), pc_isGM(target_sd)) && //Can't trade