diff options
| author | ultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2007-02-06 00:32:40 +0000 |
|---|---|---|
| committer | ultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2007-02-06 00:32:40 +0000 |
| commit | fe759b1f276fc8f904da206717a278fefa9a7a17 (patch) | |
| tree | 280b6ac2b1e51b428adf72bcf525bf136e1aa426 | |
| parent | b23e86c84c2532d5900422295c5b352b99a13b30 (diff) | |
| download | hercules-fe759b1f276fc8f904da206717a278fefa9a7a17.tar.gz hercules-fe759b1f276fc8f904da206717a278fefa9a7a17.tar.bz2 hercules-fe759b1f276fc8f904da206717a278fefa9a7a17.tar.xz hercules-fe759b1f276fc8f904da206717a278fefa9a7a17.zip | |
Undid revision r9792 (npcshopattach)
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@9796 54d463be-8e91-2dee-dedb-b68131a5f0ec
| -rw-r--r-- | Changelog-Trunk.txt | 1 | ||||
| -rw-r--r-- | src/map/script.c | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt index b84953890..715d2e96b 100644 --- a/Changelog-Trunk.txt +++ b/Changelog-Trunk.txt @@ -14,7 +14,6 @@ IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK. * The inf2 parameter of the skill_db is now red as an hexadecimal. * The super novice self-revive angel will now trigger only once per session, if you relog you can have it trigger again. [Skotlex] - * 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 f7013d43f..b5cc1d55d 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,2) ) + if( script_hasdata(st,3) ) flag = conv_num(st, script_getdata(st,3)); nd = npc_name2id(npcname); |