* 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://svn.code.sf.net/p/rathena/svn/trunk@14744 54d463be-8e91-2dee-dedb-b68131a5f0ec

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

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

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)

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;