diff options
| author | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2007-11-21 13:29:45 +0000 |
|---|---|---|
| committer | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2007-11-21 13:29:45 +0000 |
| commit | c2ca8110f6a3cab0171d32920b7a724d0c180068 (patch) | |
| tree | cce3f3a36fd692a9c7d87963ef4b14dd9c57103b /src/map/script.c | |
| parent | edaa6dcc93fd64bd961fcbc701e7ce16bf31a350 (diff) | |
| download | hercules-c2ca8110f6a3cab0171d32920b7a724d0c180068.tar.gz hercules-c2ca8110f6a3cab0171d32920b7a724d0c180068.tar.bz2 hercules-c2ca8110f6a3cab0171d32920b7a724d0c180068.tar.xz hercules-c2ca8110f6a3cab0171d32920b7a724d0c180068.zip | |
- Moved subtype from struct block_list to struct npc_data.
- Fixed some compilation warnings.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@11772 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/script.c')
| -rw-r--r-- | src/map/script.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/map/script.c b/src/map/script.c index 7d0a4b780..ff10c853a 100644 --- a/src/map/script.c +++ b/src/map/script.c @@ -11691,7 +11691,7 @@ BUILDIN_FUNC(callshop) if( script_hasdata(st,3) ) flag = script_getnum(st,3); nd = npc_name2id(shopname); - if (!nd || nd->bl.type!=BL_NPC || nd->bl.subtype!=SHOP) { + if (!nd || nd->bl.type!=BL_NPC || nd->subtype!=SHOP) { ShowError("buildin_callshop: Shop [%s] not found (or NPC is not shop type)\n", shopname); script_pushint(st,0); return 1; @@ -11720,7 +11720,7 @@ BUILDIN_FUNC(npcshopitem) int n, i; int amount; - if( !nd || nd->bl.subtype != SHOP ) + if( !nd || nd->subtype != SHOP ) { //Not found. script_pushint(st,0); return 0; @@ -11749,7 +11749,7 @@ BUILDIN_FUNC(npcshopadditem) int n, i; int amount; - if( !nd || nd->bl.subtype != SHOP ) + if( !nd || nd->subtype != SHOP ) { //Not found. script_pushint(st,0); return 0; @@ -11778,7 +11778,7 @@ BUILDIN_FUNC(npcshopdelitem) int amount; int size; - if( !nd || nd->bl.subtype != SHOP ) + if( !nd || nd->subtype != SHOP ) { //Not found. script_pushint(st,0); return 0; @@ -11815,7 +11815,7 @@ BUILDIN_FUNC(npcshopattach) if( script_hasdata(st,3) ) flag = script_getnum(st,3); - if( !nd || nd->bl.subtype != SHOP ) + if( !nd || nd->subtype != SHOP ) { //Not found. script_pushint(st,0); return 0; @@ -12708,7 +12708,7 @@ BUILDIN_FUNC(getvariableofnpc) } nd = npc_name2id(script_getstr(st,3)); - if( nd == NULL || nd->bl.subtype != SCRIPT || nd->u.scr.script == NULL ) + if( nd == NULL || nd->subtype != SCRIPT || nd->u.scr.script == NULL ) {// NPC not found or has no script ShowError("script:getvariableofnpc: can't find npc %s\n", script_getstr(st,3)); script_pushnil(st); |