diff options
| author | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2007-02-03 07:48:38 +0000 |
|---|---|---|
| committer | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2007-02-03 07:48:38 +0000 |
| commit | c70e4ff87c88500a1608a9af714e372f0d99f313 (patch) | |
| tree | 2699c1773f73035748653218697e88d0e58f3b87 /src/map/script.c | |
| parent | e613ccec54b8ef64eb3e807b5097611cb53c199c (diff) | |
| download | hercules-c70e4ff87c88500a1608a9af714e372f0d99f313.tar.gz hercules-c70e4ff87c88500a1608a9af714e372f0d99f313.tar.bz2 hercules-c70e4ff87c88500a1608a9af714e372f0d99f313.tar.xz hercules-c70e4ff87c88500a1608a9af714e372f0d99f313.zip | |
- Fixed the flag parameter not working on npcshopattach
- Modified unit_walktoxy so it accepts flag &4. When used, this flag will delay the walk request if the character is unable to move because of the can't walk delay. This is used for player and homunculus walk requests.
- Removed the delay walking code from clif.c as it's now handled by unit.c
- Added a possible crash protection in clif_skillfail when the player is without a connection.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@9782 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/script.c')
| -rw-r--r-- | src/map/script.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/map/script.c b/src/map/script.c index 9ae8e3d55..3cce74af1 100644 --- a/src/map/script.c +++ b/src/map/script.c @@ -12014,8 +12014,8 @@ int buildin_npcshopattach(struct script_state *st) char* npcname = conv_str(st, & (st->stack->stack_data[st->start+2])); int flag = 1; - if( script_hasdata(st,2) ) - flag = conv_num(st, script_getdata(st,2)); + if( script_hasdata(st,3) ) + flag = conv_num(st, script_getdata(st,3)); nd = npc_name2id(npcname); |