summaryrefslogtreecommitdiff
path: root/src/map/npc.c
diff options
context:
space:
mode:
authorskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2007-11-18 16:13:20 +0000
committerskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2007-11-18 16:13:20 +0000
commitee3f834706fcdb2df31987e5731da06946aa1060 (patch)
treea0a5b9137b9b010889feaddde075b4afed2ebcd2 /src/map/npc.c
parentad3c28295537a5d942809ca07cae49bc350c45ab (diff)
downloadhercules-ee3f834706fcdb2df31987e5731da06946aa1060.tar.gz
hercules-ee3f834706fcdb2df31987e5731da06946aa1060.tar.bz2
hercules-ee3f834706fcdb2df31987e5731da06946aa1060.tar.xz
hercules-ee3f834706fcdb2df31987e5731da06946aa1060.zip
- setting npc cells will no longer work on non-walkable tiles (since you could do this to override cell types and make unwalkable cells walkable again, for example).
- Small fix in the char-server accept code. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@11755 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/npc.c')
-rw-r--r--src/map/npc.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/map/npc.c b/src/map/npc.c
index 9a6a5ff51..0636bc797 100644
--- a/src/map/npc.c
+++ b/src/map/npc.c
@@ -2544,6 +2544,8 @@ static const char* npc_parse_mapcell(char* w1, char* w2, char* w3, char* w4, con
for( x = x0; x <= x1; ++x )
for( y = y0; y <= y1; ++y )
+ if (map_getcell(m, x, y, CELL_CHKNOREACH))
+ continue;
map_setcell(m, x, y, cell);
return strchr(start,'\n');// continue