From 01dc34c9a73819dfbf0e8242a9ba7e572d76955d Mon Sep 17 00:00:00 2001 From: brianluau Date: Mon, 10 May 2010 00:53:22 +0000 Subject: - Fixed the Juice Maker's "As many as I can" option. (bugreport:4155) - Removed a duplicate 'next' in Kiel Hyre Quest. (bugreport:4222) - Fixed 'checkequipedcard' not counter-checking for signed items. (bugreport:4231) git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14294 54d463be-8e91-2dee-dedb-b68131a5f0ec --- src/map/atcommand.c | 2 +- src/map/script.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'src/map') 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;istatus.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;ninventory_data[i]->slot;n++){ if(sd->status.inventory[i].card[n]==c){ script_pushint(st,1); -- cgit v1.2.3-70-g09d2