From 257315e53a493c10e5931eccca0daf51dd01fa54 Mon Sep 17 00:00:00 2001 From: ai4rei Date: Sun, 29 May 2011 12:41:16 +0000 Subject: * Updated script commands 'npcshopitem', 'npcshopadditem' and 'npcshopdelitem' to support cashshops as well (bugreport:4928). git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14836 54d463be-8e91-2dee-dedb-b68131a5f0ec --- src/map/script.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/map/script.c') diff --git a/src/map/script.c b/src/map/script.c index a33b58341..44bac8c9d 100644 --- a/src/map/script.c +++ b/src/map/script.c @@ -12875,7 +12875,7 @@ BUILDIN_FUNC(npcshopitem) int n, i; int amount; - if( !nd || nd->subtype != SHOP ) + if( !nd || ( nd->subtype != SHOP && nd->subtype != CASHSHOP ) ) { //Not found. script_pushint(st,0); return 0; @@ -12904,7 +12904,7 @@ BUILDIN_FUNC(npcshopadditem) int n, i; int amount; - if( !nd || nd->subtype != SHOP ) + if( !nd || ( nd->subtype != SHOP && nd->subtype != CASHSHOP ) ) { //Not found. script_pushint(st,0); return 0; @@ -12935,7 +12935,7 @@ BUILDIN_FUNC(npcshopdelitem) int amount; int size; - if( !nd || nd->subtype != SHOP ) + if( !nd || ( nd->subtype != SHOP && nd->subtype != CASHSHOP ) ) { //Not found. script_pushint(st,0); return 0; -- cgit v1.2.3-70-g09d2