From cc360cdbf715d6aa4ea43a1152c86093e2c47f13 Mon Sep 17 00:00:00 2001 From: skotlex Date: Sun, 23 Jul 2006 16:40:46 +0000 Subject: - 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 --- src/map/script.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'src/map/script.c') 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; jinventory_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 || -- cgit v1.2.3-70-g09d2