summaryrefslogtreecommitdiff
path: root/src/map
diff options
context:
space:
mode:
authorskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-07-07 13:24:47 +0000
committerskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-07-07 13:24:47 +0000
commit2479f55a86fc2919805e4f38f6ae556f2f045fd4 (patch)
treee2e16aea36e04ffb8e9b2505b1dd0fda32272fbe /src/map
parent76106b842159abd58d6a69fc0bb8cb401757da44 (diff)
downloadhercules-2479f55a86fc2919805e4f38f6ae556f2f045fd4.tar.gz
hercules-2479f55a86fc2919805e4f38f6ae556f2f045fd4.tar.bz2
hercules-2479f55a86fc2919805e4f38f6ae556f2f045fd4.tar.xz
hercules-2479f55a86fc2919805e4f38f6ae556f2f045fd4.zip
- Added a temporary band-aid to prevent executing the script of non-arrows when they are equipped on the arrow-slot (until the actual cause of why pc_unequipitem is not working correctly is discovered/fixed)
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@7558 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map')
-rw-r--r--src/map/status.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/map/status.c b/src/map/status.c
index 09d6992b2..bce2fd246 100644
--- a/src/map/status.c
+++ b/src/map/status.c
@@ -1694,7 +1694,9 @@ int status_calc_pc(struct map_session_data* sd,int first)
if(sd->equip_index[EQI_AMMO] >= 0){ // –î
index = sd->equip_index[EQI_AMMO];
- if(sd->inventory_data[index]){ // Arrows
+ //FIXME: The equip check is a temporary measure until a speed exploit
+ // that has yet to be fixed!
+ if(sd->inventory_data[index] && sd->status.inventory[index].equip&EQP_AMMO){ // Arrows
sd->state.lr_flag = 2;
run_script(sd->inventory_data[index]->script,0,sd->bl.id,0);
sd->state.lr_flag = 0;