diff options
| author | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-05-30 15:29:17 +0000 |
|---|---|---|
| committer | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-05-30 15:29:17 +0000 |
| commit | a1fddcf716995eddf1c26e1395c8cc24ce6b3eba (patch) | |
| tree | 81c5947a93a0b58b2d684a2d9589cec4c68f1673 /src/map/npc.c | |
| parent | 6f704b3e087d36513e4c5b190da10141231fb187 (diff) | |
| download | hercules-a1fddcf716995eddf1c26e1395c8cc24ce6b3eba.tar.gz hercules-a1fddcf716995eddf1c26e1395c8cc24ce6b3eba.tar.bz2 hercules-a1fddcf716995eddf1c26e1395c8cc24ce6b3eba.tar.xz hercules-a1fddcf716995eddf1c26e1395c8cc24ce6b3eba.zip | |
- Small optimization in battle_check_target
- Disabled ontouch npcs triggering on hidden/chase-walk characters.
- Added the SC* code blocks relevant to SC_AVOID, SC_CHANGE, SC_BLOODLUST, SC_FLEET
- Added structure status_data to homun_data
- Added handling of BL_HOMUNCULUS in status_heal, status_damage.
- Cleaned up the homun-submitted code, moved the relevant code to status_calc_homunculus.
- Updated map-server Makefile to compile mercenary.* files.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@6847 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/npc.c')
| -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 93fc25e04..3c4e09b41 100644 --- a/src/map/npc.c +++ b/src/map/npc.c @@ -945,7 +945,7 @@ int npc_touch_areanpc(struct map_session_data *sd,int m,int x,int y) switch(map[m].npc[i]->bl.subtype) {
case WARP:
// hidden chars cannot use warps -- is it the same for scripts too?
- if (sd->sc.option&6 ||
+ if (sd->sc.option&(OPTION_HIDE|OPTION_CLOAK|OPTION_CHASEWALK) ||
(!battle_config.duel_allow_teleport && sd->duel_group)) // duel rstrct [LuzZza]
break;
pc_setpos(sd,map[m].npc[i]->u.warp.mapindex,map[m].npc[i]->u.warp.x,map[m].npc[i]->u.warp.y,0);
|