summaryrefslogtreecommitdiff
path: root/src/map/script.c
diff options
context:
space:
mode:
authorskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2007-02-23 18:41:56 +0000
committerskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2007-02-23 18:41:56 +0000
commiteb0a137041d3a5ee6385762b8374e98b3867d5a0 (patch)
treef11f4036af32507c0e6bbc92b55d17d07f4e3692 /src/map/script.c
parent9157078e09096898afee0c9be17737df72bebaee (diff)
downloadhercules-eb0a137041d3a5ee6385762b8374e98b3867d5a0.tar.gz
hercules-eb0a137041d3a5ee6385762b8374e98b3867d5a0.tar.bz2
hercules-eb0a137041d3a5ee6385762b8374e98b3867d5a0.tar.xz
hercules-eb0a137041d3a5ee6385762b8374e98b3867d5a0.zip
- Minor cleanups
- Adjusted menu-based skills so you can't reuse the same skill until you've dealt with the menu. - Adjust autospells so that removing an autospell works when the script of the card that removes the autospell is triggered before the script that adds the spell. - The "requested name of gm-hidden char" warning will not be displayed when the object in question is an NPC (since you can use Intravision to do this). - Corrected the header format for invisible npcs. - Venom Knife no longer takes into accounts cards or EDP. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@9905 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/script.c')
-rw-r--r--src/map/script.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/src/map/script.c b/src/map/script.c
index c8d1ef2a8..e3341d546 100644
--- a/src/map/script.c
+++ b/src/map/script.c
@@ -12936,16 +12936,13 @@ BUILDIN_FUNC(getvariableofnpc)
st->state = END;
return 1;
}
- else if( nd == NULL || nd->bl.subtype != SCRIPT || nd->u.scr.script == NULL )
+ if( nd == NULL || nd->bl.subtype != SCRIPT || nd->u.scr.script == NULL )
{// NPC not found or has no script
ShowError("script: getvariableofnpc: can't find npc %s\n", npc_name);
st->state = END;
return 1;
}
- else
- {// push variable reference
- push_val2(st->stack, C_NAME, num, &nd->u.scr.script->script_vars );
- }
+ push_val2(st->stack, C_NAME, num, &nd->u.scr.script->script_vars );
}
return 0;
}