diff options
| author | Wushin <pasekei@gmail.com> | 2015-04-29 22:25:16 -0500 |
|---|---|---|
| committer | Wushin <pasekei@gmail.com> | 2015-04-29 22:25:16 -0500 |
| commit | 4d416f4ee37e7d289d4009e78e3a68605065fc0a (patch) | |
| tree | 81419a89db62ac3301663b83e718b8d74b437407 /world/map/npc/functions | |
| parent | 31a11c7e19d721afe2f48f18bf36baaf2f666488 (diff) | |
| parent | 5c596e4d1723d58bf300ff831dcfb2090a2da0ec (diff) | |
| download | serverdata-4d416f4ee37e7d289d4009e78e3a68605065fc0a.tar.gz serverdata-4d416f4ee37e7d289d4009e78e3a68605065fc0a.tar.bz2 serverdata-4d416f4ee37e7d289d4009e78e3a68605065fc0a.tar.xz serverdata-4d416f4ee37e7d289d4009e78e3a68605065fc0a.zip | |
Merge pull request #353 from mekolat/getitemname
deprecate getitemname and getequipname
Diffstat (limited to 'world/map/npc/functions')
| -rw-r--r-- | world/map/npc/functions/DyeConfig.txt | 4 | ||||
| -rw-r--r-- | world/map/npc/functions/default_npc_checks.txt | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/world/map/npc/functions/DyeConfig.txt b/world/map/npc/functions/DyeConfig.txt index 1da1e734..0072dd26 100644 --- a/world/map/npc/functions/DyeConfig.txt +++ b/world/map/npc/functions/DyeConfig.txt @@ -23,7 +23,7 @@ OnInit: end; S_Array: - if(getitemname($@DYE_items$[$@w]) == "Unknown Item") goto L_Fail; + if(getitemlink($@DYE_items$[$@w]) == "Unknown Item") goto L_Fail; set $@c, 0; callsub S_Color; set $@w, $@w + 1; @@ -35,7 +35,7 @@ L_Fail: mapexit; S_Color: - if(getitemname($@DYE_colors$[$@c] + $@DYE_items$[$@w]) == "Unknown Item") goto L_Fail; + if(getitemlink($@DYE_colors$[$@c] + $@DYE_items$[$@w]) == "Unknown Item") goto L_Fail; set $@c, $@c + 1; if($@c < getarraysize($@DYE_colors$)) goto S_Color; return; diff --git a/world/map/npc/functions/default_npc_checks.txt b/world/map/npc/functions/default_npc_checks.txt index 446cf961..deb3ba64 100644 --- a/world/map/npc/functions/default_npc_checks.txt +++ b/world/map/npc/functions/default_npc_checks.txt @@ -109,7 +109,7 @@ L_ReturnMissing: goto L_MissingMsg; L_MissingMsg: - mes "[@@"+@delitem_ids[@msg_loop]+"|"+getitemname(@delitem_ids[@msg_loop])+"@@] "+countitem(getitemname(@delitem_ids[@msg_loop]))+"/"+@delitem_counts[@msg_loop]; + mes "[@@"+@delitem_ids[@msg_loop]+"|"+getitemlink(@delitem_ids[@msg_loop])+"@@] "+countitem(getitemlink(@delitem_ids[@msg_loop]))+"/"+@delitem_counts[@msg_loop]; goto L_NextMsgCheck; L_NextMsgCheck: |