summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorai4rei <ai4rei@54d463be-8e91-2dee-dedb-b68131a5f0ec>2010-12-12 18:06:14 +0000
committerai4rei <ai4rei@54d463be-8e91-2dee-dedb-b68131a5f0ec>2010-12-12 18:06:14 +0000
commitf882f21e562ee2df9c2392ebd96858ff4647798e (patch)
treec61a5a3789f11c73ce4f982e8789d38311967359
parent4dcabc941a5da551afdd6cf9e700268ccaf1ca58 (diff)
downloadhercules-f882f21e562ee2df9c2392ebd96858ff4647798e.tar.gz
hercules-f882f21e562ee2df9c2392ebd96858ff4647798e.tar.bz2
hercules-f882f21e562ee2df9c2392ebd96858ff4647798e.tar.xz
hercules-f882f21e562ee2df9c2392ebd96858ff4647798e.zip
* Removed disabled backup of script command 'isequipped' (since r1605).
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14586 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r--Changelog-Trunk.txt1
-rw-r--r--src/map/script.c62
2 files changed, 1 insertions, 62 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index 046f43e40..e45582d41 100644
--- a/Changelog-Trunk.txt
+++ b/Changelog-Trunk.txt
@@ -1,6 +1,7 @@
Date Added
2010/12/12
+ * Removed disabled backup of script command 'isequipped' (since r1605). [Ai4rei]
* Made script engine's DEBUG_DISASM block use script_op2name, rather than hardcoding operator names as per TODO from r13083 (related r9569, follow up to r10667). [Ai4rei]
* Cleaned up MOTD reading (related r292 and r4552). [Ai4rei]
- Added a warning for common client crash caused by the sequence ' :' in MOTD.
diff --git a/src/map/script.c b/src/map/script.c
index 3a7384a04..72f6c3774 100644
--- a/src/map/script.c
+++ b/src/map/script.c
@@ -11823,68 +11823,6 @@ BUILDIN_FUNC(isday)
}
/*================================================
- * Check whether another item/card has been
- * equipped - used for 2/15's cards patch [celest]
- *------------------------------------------------*/
-// leave this here, just in case
-#if 0
-BUILDIN_FUNC(isequipped)
-{
- TBL_PC *sd;
- int i, j, k, id = 1;
- int ret = -1;
-
- sd = script_rid2sd(st);
-
- for (i=0; id!=0; i++) {
- int flag = 0;
-
- FETCH (i+2, id) else id = 0;
- if (id <= 0)
- continue;
-
- for (j=0; j<EQI_MAX; j++) {
- int index;
- index = sd->equip_index[j];
- if(index < 0) continue;
- if(j == EQI_HAND_R && sd->equip_index[EQI_HAND_L] == index) continue;
- if(j == EQI_HEAD_MID && sd->equip_index[EQI_HEAD_LOW] == index) continue;
- if(j == EQI_HEAD_TOP && (sd->equip_index[EQI_HEAD_MID] == index || sd->equip_index[EQI_HEAD_LOW] == index)) continue;
-
- if(!sd->inventory_data[index])
- continue;
-
- if(itemdb_type(id) != IT_CARD) { //Non card
- if (sd->inventory_data[index]->nameid != id)
- continue;
- flag = 1;
- break;
- } else { //Card
- if (itemdb_isspecial(sd->status.inventory[index].card[0]))
- continue;
- for(k=0; k<sd->inventory_data[index]->slot; k++) {
- if (sd->status.inventory[index].card[k] == id)
- {
- flag = 1;
- break;
- }
- }
- }
- if (flag) break;
- }
- if (ret == -1)
- ret = flag;
- else
- ret &= flag;
- if (!ret) break;
- }
-
- script_pushint(st,ret);
- return 0;
-}
-#endif
-
-/*================================================
* Check how many items/cards in the list are
* equipped - used for 2/15's cards patch [celest]
*------------------------------------------------*/