diff options
| author | ai4rei <ai4rei@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2011-03-15 18:10:13 +0000 |
|---|---|---|
| committer | ai4rei <ai4rei@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2011-03-15 18:10:13 +0000 |
| commit | dbe06dcb0d692931645463958ef21c1008717d89 (patch) | |
| tree | 36f9fdaa646724d20146a8ce913d277e799ce028 | |
| parent | f3990e452520e98b6c24167dc8d84e36bee84066 (diff) | |
| download | hercules-dbe06dcb0d692931645463958ef21c1008717d89.tar.gz hercules-dbe06dcb0d692931645463958ef21c1008717d89.tar.bz2 hercules-dbe06dcb0d692931645463958ef21c1008717d89.tar.xz hercules-dbe06dcb0d692931645463958ef21c1008717d89.zip | |
* Fixed monsters getting warped when stepping on an NPC warp when at least one of the bits of setting 'mob_warp' was set (bugreport:4766, since r12757).
- Fixed option 'monster_ai' referring to setting 'mob_npc_warp' rather than 'mob_warp' (follow up to r8135).
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14744 54d463be-8e91-2dee-dedb-b68131a5f0ec
| -rw-r--r-- | Changelog-Trunk.txt | 2 | ||||
| -rw-r--r-- | conf/Changelog.txt | 2 | ||||
| -rw-r--r-- | conf/battle/monster.conf | 2 | ||||
| -rw-r--r-- | src/map/npc.c | 2 |
4 files changed, 6 insertions, 2 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt index 2d5c675fd..6b3d6f145 100644 --- a/Changelog-Trunk.txt +++ b/Changelog-Trunk.txt @@ -1,5 +1,7 @@ Date Added +2011/03/15 + * Fixed monsters getting warped when stepping on an NPC warp when at least one of the bits of setting 'mob_warp' was set (bugreport:4766, since r12757). [Ai4rei] 2011/03/14 * Fixed a typo in npc_touchnext_areanpc (NPC's map being used as it's x-coordinate), which caused ::OnTouch_ invokation to affect different area than intended (bugreport:4814, since r14097). [Ai4rei] 2011/03/13 diff --git a/conf/Changelog.txt b/conf/Changelog.txt index a1eb97ea6..35e57d601 100644 --- a/conf/Changelog.txt +++ b/conf/Changelog.txt @@ -1,5 +1,7 @@ Date Added +2011/03/15 + * Rev. 14744 Fixed option 'monster_ai' referring to setting 'mob_npc_warp' rather than 'mob_warp' (follow up to r8135). [Ai4rei] 2011/03/06 * Rev. 14732 Added search store info related settings. [Ai4rei] 2011/02/23 diff --git a/conf/battle/monster.conf b/conf/battle/monster.conf index ada628a37..a4c985055 100644 --- a/conf/battle/monster.conf +++ b/conf/battle/monster.conf @@ -51,7 +51,7 @@ monster_max_aspd: 199 // have players on them, instead of only for mobs who are in the vecinity // of players. // 0x040: When set, when the mob's target changes map, the mob will walk towards -// any npc-warps in it's sight of view (use with mob_npc_warp below) +// any npc-warps in it's sight of view (use with mob_warp below) // 0x100: When set, a mob will pick a random skill from it's list and start from // that instead of checking skills in orders (when unset, if a mob has too // many skills, the ones near the end will rarely get selected) diff --git a/src/map/npc.c b/src/map/npc.c index 77143eaed..430c04f3c 100644 --- a/src/map/npc.c +++ b/src/map/npc.c @@ -902,7 +902,7 @@ int npc_touch_areanpc2(struct mob_data *md) switch( map[m].npc[i]->subtype ) { case WARP: - if( !battle_config.mob_warp&1 ) + if( !( battle_config.mob_warp&1 ) ) continue; xs = map[m].npc[i]->u.warp.xs; ys = map[m].npc[i]->u.warp.ys; |