diff options
| author | ai4rei <ai4rei@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2011-05-29 12:41:16 +0000 |
|---|---|---|
| committer | ai4rei <ai4rei@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2011-05-29 12:41:16 +0000 |
| commit | 257315e53a493c10e5931eccca0daf51dd01fa54 (patch) | |
| tree | b20522d10e6ae73f52c792fccaaa568b804e905d /src/map | |
| parent | 73ced774f2fee93de2881356144ba539d3396118 (diff) | |
| download | hercules-257315e53a493c10e5931eccca0daf51dd01fa54.tar.gz hercules-257315e53a493c10e5931eccca0daf51dd01fa54.tar.bz2 hercules-257315e53a493c10e5931eccca0daf51dd01fa54.tar.xz hercules-257315e53a493c10e5931eccca0daf51dd01fa54.zip | |
* 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
Diffstat (limited to 'src/map')
| -rw-r--r-- | src/map/script.c | 6 |
1 files changed, 3 insertions, 3 deletions
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; |