summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Changelog-Trunk.txt2
-rw-r--r--src/map/script.c14
2 files changed, 9 insertions, 7 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index 5793f8297..9289d399c 100644
--- a/Changelog-Trunk.txt
+++ b/Changelog-Trunk.txt
@@ -3,6 +3,8 @@ Date Added
AS OF SVN REV. 5091, WE ARE NOW USING TRUNK. ALL UNTESTED BUGFIXES/FEATURES GO INTO TRUNK.
IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
+2006/07/23
+ * Fixed buildin_isequip not working correctly with non-cards. [Skotlex]
2006/07/22
* Updated mob_db.sql to latest. [Skotlex]
* Applied Toms's suggested corrections to homun code. [Skotlex]
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 ||