summaryrefslogtreecommitdiff
path: root/src/map
diff options
context:
space:
mode:
Diffstat (limited to 'src/map')
-rw-r--r--src/map/atcommand.c2
-rw-r--r--src/map/script.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/map/atcommand.c b/src/map/atcommand.c
index 7a4690efb..e5567aa2a 100644
--- a/src/map/atcommand.c
+++ b/src/map/atcommand.c
@@ -8746,7 +8746,7 @@ AtCommandInfo atcommand_info[] = {
{ "mobsearch", 10,10, atcommand_mobsearch },
{ "cleanmap", 40,40, atcommand_cleanmap },
{ "npctalk", 20,20, atcommand_npctalk },
- { "npctalkc", 20,20, atcommand_npctalk },
+ { "npctalkc", 20,20, atcommand_npctalk },
{ "pettalk", 10,10, atcommand_pettalk },
{ "users", 40,40, atcommand_users },
{ "reset", 40,40, atcommand_reset },
diff --git a/src/map/script.c b/src/map/script.c
index 19fb01cc3..12f3a8e23 100644
--- a/src/map/script.c
+++ b/src/map/script.c
@@ -11151,6 +11151,8 @@ BUILDIN_FUNC(checkequipedcard)
if(sd){
for(i=0;i<MAX_INVENTORY;i++){
if(sd->status.inventory[i].nameid > 0 && sd->status.inventory[i].amount && sd->inventory_data[i]){
+ if (itemdb_isspecial(sd->status.inventory[i].card[0]))
+ continue;
for(n=0;n<sd->inventory_data[i]->slot;n++){
if(sd->status.inventory[i].card[n]==c){
script_pushint(st,1);