diff options
| author | ultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2007-02-05 20:34:22 +0000 |
|---|---|---|
| committer | ultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2007-02-05 20:34:22 +0000 |
| commit | cf7fd037745119d150db5e91fb3978b00f2b8851 (patch) | |
| tree | a851289e85a120127e92cfc9653e942b3c95c4ff | |
| parent | b6a4e310b0582097f61faf175a59a1056262f911 (diff) | |
| download | hercules-cf7fd037745119d150db5e91fb3978b00f2b8851.tar.gz hercules-cf7fd037745119d150db5e91fb3978b00f2b8851.tar.bz2 hercules-cf7fd037745119d150db5e91fb3978b00f2b8851.tar.xz hercules-cf7fd037745119d150db5e91fb3978b00f2b8851.zip | |
Applied Dj-Yhn's fix to 'npcshopattach'
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@9792 54d463be-8e91-2dee-dedb-b68131a5f0ec
| -rw-r--r-- | Changelog-Trunk.txt | 1 | ||||
| -rw-r--r-- | src/map/script.c | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt index ea659a5ea..d6135e181 100644 --- a/Changelog-Trunk.txt +++ b/Changelog-Trunk.txt @@ -4,6 +4,7 @@ AS OF SVN REV. 5091, WE ARE NOW USING TRUNK. ALL UNTESTED BUGFIXES/FEATURES GO IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK. 2007/02/05 + * Applied Dj-Yhn's fix to 'npcshopattach' [ultramage] * Fixed the skill tree not always updating when using @allskill * Probably fixed the target-change on melee attack setting not working. * Moved the deletion of the invincible timer when using skills so that it diff --git a/src/map/script.c b/src/map/script.c index b5cc1d55d..f7013d43f 100644 --- a/src/map/script.c +++ b/src/map/script.c @@ -12007,7 +12007,7 @@ 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,3) ) + if( script_hasdata(st,2) ) flag = conv_num(st, script_getdata(st,3)); nd = npc_name2id(npcname); |