summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2007-11-21 10:28:34 +0000
committerskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2007-11-21 10:28:34 +0000
commitedaa6dcc93fd64bd961fcbc701e7ce16bf31a350 (patch)
treef6ee1d33012561e6ee6c9fe127a7f5a9f1c47ed2
parenta3f33b60271e203392f8f8e4dbaa4ccc04b87341 (diff)
downloadhercules-edaa6dcc93fd64bd961fcbc701e7ce16bf31a350.tar.gz
hercules-edaa6dcc93fd64bd961fcbc701e7ce16bf31a350.tar.bz2
hercules-edaa6dcc93fd64bd961fcbc701e7ce16bf31a350.tar.xz
hercules-edaa6dcc93fd64bd961fcbc701e7ce16bf31a350.zip
- Optimized a bit the map set cell imperative so it only fails when the target cells are of native type wall/ground, so that it still allows setting/unsetting temporarily unwalkable types by using icewall types of cell.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@11770 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r--src/map/npc.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/map/npc.c b/src/map/npc.c
index ea5e17502..89ab9e4cb 100644
--- a/src/map/npc.c
+++ b/src/map/npc.c
@@ -2544,7 +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))
+ int type = map_getcell(m, x, y, CELL_GETTYPE);
+ if (type == 1 || type == 5) //TODO: use defines for the cell types.
continue;
map_setcell(m, x, y, cell);
}