diff options
| author | greenboxal2 <greenboxal2@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2012-04-21 08:46:26 +0000 |
|---|---|---|
| committer | greenboxal2 <greenboxal2@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2012-04-21 08:46:26 +0000 |
| commit | 5a735a416f33f355babfc150bcedcc220e684255 (patch) | |
| tree | 0d2df8e8eba046bf84465fbdc4a89bc552a02cdc /src/map/npc.c | |
| parent | 4f68a6ef917b92df214a12dcef09cffdfa1e80ff (diff) | |
| download | hercules-5a735a416f33f355babfc150bcedcc220e684255.tar.gz hercules-5a735a416f33f355babfc150bcedcc220e684255.tar.bz2 hercules-5a735a416f33f355babfc150bcedcc220e684255.tar.xz hercules-5a735a416f33f355babfc150bcedcc220e684255.zip | |
Fixed bugreport:5586 SC_CAMOUFLAGE can be removed by using RA_CAMOUFLAGE again, also portals won't warp players under this status.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@15902 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 af0699294..661406c95 100644 --- a/src/map/npc.c +++ b/src/map/npc.c @@ -896,7 +896,7 @@ int npc_touch_areanpc(struct map_session_data* sd, int m, int x, int y) } switch(map[m].npc[i]->subtype) { case WARP: - if( pc_ishiding(sd) ) + if( pc_ishiding(sd) || (sd->sc.count && sd->sc.data[SC_CAMOUFLAGE]) ) break; // hidden chars cannot use warps pc_setpos(sd,map[m].npc[i]->u.warp.mapindex,map[m].npc[i]->u.warp.x,map[m].npc[i]->u.warp.y,CLR_OUTSIGHT); break; |