diff options
| author | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-06-08 15:44:04 +0000 |
|---|---|---|
| committer | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-06-08 15:44:04 +0000 |
| commit | febdcd8873ad1198e80f6a3a4a4f55f2cc557911 (patch) | |
| tree | 4e9755411e79ddf5bbf7a3c9cb18761007c32dba /src/map/npc.c | |
| parent | 3b364715dc1b63738c6684194d1e2481ccbd6256 (diff) | |
| download | hercules-febdcd8873ad1198e80f6a3a4a4f55f2cc557911.tar.gz hercules-febdcd8873ad1198e80f6a3a4a4f55f2cc557911.tar.bz2 hercules-febdcd8873ad1198e80f6a3a4a4f55f2cc557911.tar.xz hercules-febdcd8873ad1198e80f6a3a4a4f55f2cc557911.zip | |
- Updated mob_npc_warp to a three-state config switch. 0 disables. 1 enable only on warps that don't lead to nobranch maps. 2 - enable on all warps.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@7048 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/npc.c')
| -rw-r--r-- | src/map/npc.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/map/npc.c b/src/map/npc.c index e9e472721..e9ddb3e53 100644 --- a/src/map/npc.c +++ b/src/map/npc.c @@ -996,6 +996,10 @@ int npc_touch_areanpc2(struct block_list *bl) xs = map_mapindex2mapid(map[m].npc[i]->u.warp.mapindex);
if (xs < 0) // Can't warp object between map servers...
return 0;
+
+ if(battle_config.mob_npc_warp<2 && map[xs].flag.nobranch)
+ return 0; //Disable warps to nobranch maps.
+
unit_warp(bl, xs, map[m].npc[i]->u.warp.x,map[m].npc[i]->u.warp.y,0);
return 1;
}
|