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 /src/map | |
| 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
Diffstat (limited to 'src/map')
| -rw-r--r-- | src/map/npc.c | 2 |
1 files changed, 1 insertions, 1 deletions
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; |