summaryrefslogtreecommitdiff
path: root/src/map
diff options
context:
space:
mode:
authorskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-07-23 16:40:46 +0000
committerskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-07-23 16:40:46 +0000
commitcc360cdbf715d6aa4ea43a1152c86093e2c47f13 (patch)
tree80514b4bd0d911d5c1d382bf00a0d525f370f451 /src/map
parent8f0fe37556d3105ca09ab6e09a27a05543ff98f0 (diff)
downloadhercules-cc360cdbf715d6aa4ea43a1152c86093e2c47f13.tar.gz
hercules-cc360cdbf715d6aa4ea43a1152c86093e2c47f13.tar.bz2
hercules-cc360cdbf715d6aa4ea43a1152c86093e2c47f13.tar.xz
hercules-cc360cdbf715d6aa4ea43a1152c86093e2c47f13.zip
- Fixed buildin_isequip not working correctly with non-cards.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@7838 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map')
-rw-r--r--src/map/script.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/map/script.c b/src/map/script.c
index f55355cd8..d17b84fdd 100644
--- a/src/map/script.c
+++ b/src/map/script.c
@@ -9488,10 +9488,10 @@ int buildin_isequipped(struct script_state *st)
continue;
if(itemdb_type(id) != IT_CARD) { //Non card
- if (sd->inventory_data[index]->nameid == id) {
- flag = 1;
- break;
- }
+ if (sd->inventory_data[index]->nameid != id)
+ continue;
+ flag = 1;
+ break;
} else { //Card
if (itemdb_isspecial(sd->status.inventory[index].card[0]))
continue;
@@ -9594,7 +9594,6 @@ int buildin_isequipped(struct script_state *st)
FETCH (i+2, id) else id = 0;
if (id <= 0)
continue;
-
flag = 0;
for (j=0; j<EQI_MAX; j++)
{
@@ -9608,8 +9607,9 @@ int buildin_isequipped(struct script_state *st)
continue;
if (itemdb_type(id) != IT_CARD) {
- if (sd->inventory_data[index]->nameid == id)
- flag = 1;
+ if (sd->inventory_data[index]->nameid != id)
+ continue;
+ flag = 1;
break;
} else { //Cards
if (sd->inventory_data[index]->slot == 0 ||